Changeset 59117 in vbox for trunk/src/VBox/Main/src-server/linux

Timestamp:

Dec 14, 2015 2:04:37 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104688

Message:

USB,Main: Rework USBProxyService. Split it into a USBProxyService and USBProxyBackend class, USBProxyService can use multiple USBProxyBackend instances as sources for USB devices to attach to a VM which will be used for USB/IP support. Change the PDM USB API to contain a backend parameter instead of a remote flag to indicate the USB backend to use for the given device.

Location:

trunk/src/VBox/Main/src-server/linux

Files:

• USBGetDevices.cpp (modified) (1 diff)
• USBProxyBackendLinux.cpp (copied) (copied from trunk/src/VBox/Main/src-server/linux/USBProxyServiceLinux.cpp ) (19 diffs)

trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp

@@ -1352 +1352 @@
                  pInfo->mDevice);
     Dev->pszAddress = pszAddress;
+    Dev->pszBackend = RTStrDup("host");
 
     /* Work out from the data collected whether we can support this device. */

trunk/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp

@@ -60 +60 @@
  * Initialize data members.
  */
-USBProxyServiceLinux::USBProxyServiceLinux(Host *aHost)
-    : USBProxyService(aHost), mhFile(NIL_RTFILE), mhWakeupPipeR(NIL_RTPIPE),
+USBProxyBackendLinux::USBProxyBackendLinux(USBProxyService *aUsbProxyService)
+    : USBProxyBackend(aUsbProxyService), mhFile(NIL_RTFILE), mhWakeupPipeR(NIL_RTPIPE),
       mhWakeupPipeW(NIL_RTPIPE), mUsingUsbfsDevices(true /* see init */),
       mUdevPolls(0), mpWaiter(NULL)
 {
-    LogFlowThisFunc(("aHost=%p\n", aHost));
+    LogFlowThisFunc(("aUsbProxyService=%p\n", aUsbProxyService));
 }
 
@@ -71 +71 @@
  * Initializes the object (called right after construction).
  *
- * @returns S_OK on success and non-fatal failures, some COM error otherwise.
- */
-HRESULT USBProxyServiceLinux::init(void)
+ * @returns VBox status code.
+ */
+int USBProxyBackendLinux::init(void)
 {
     const char *pcszDevicesRoot;
@@ -86 +86 @@
                 mUsingUsbfsDevices ? "USBFS" : "sysfs"));
     }
-    mLastError = rc;
-    return S_OK;
+
+    return rc;
 }
 
@@ -95 +95 @@
  * @returns iprt status code.
  */
-int USBProxyServiceLinux::initUsbfs(void)
+int USBProxyBackendLinux::initUsbfs(void)
 {
     Assert(mUsingUsbfsDevices);
@@ -128 +128 @@
             }
             else
-                Log(("USBProxyServiceLinux::USBProxyServiceLinux: RTFilePipe failed with rc=%Rrc\n", rc));
+                Log(("USBProxyBackendLinux::USBProxyBackendLinux: RTFilePipe failed with rc=%Rrc\n", rc));
             RTFileClose(mhFile);
         }
@@ -137 +137 @@
     {
         rc = VERR_NO_MEMORY;
-        Log(("USBProxyServiceLinux::USBProxyServiceLinux: out of memory!\n"));
+        Log(("USBProxyBackendLinux::USBProxyBackendLinux: out of memory!\n"));
     }
 
@@ -150 +150 @@
  * @returns iprt status code
  */
-int USBProxyServiceLinux::initSysfs(void)
+int USBProxyBackendLinux::initSysfs(void)
 {
     Assert(!mUsingUsbfsDevices);
@@ -181 +181 @@
  * Stop all service threads and free the device chain.
  */
-USBProxyServiceLinux::~USBProxyServiceLinux()
+USBProxyBackendLinux::~USBProxyBackendLinux()
 {
     LogFlowThisFunc(("\n"));
@@ -206 +206 @@
  * and mark them as freed.
  */
-void USBProxyServiceLinux::doUsbfsCleanupAsNeeded()
+void USBProxyBackendLinux::doUsbfsCleanupAsNeeded()
 {
     /*
@@ -220 +220 @@
 
 
-int USBProxyServiceLinux::captureDevice(HostUSBDevice *aDevice)
+int USBProxyBackendLinux::captureDevice(HostUSBDevice *aDevice)
 {
     AssertReturn(aDevice, VERR_GENERAL_FAILURE);
@@ -239 +239 @@
 
 
-int USBProxyServiceLinux::releaseDevice(HostUSBDevice *aDevice)
+int USBProxyBackendLinux::releaseDevice(HostUSBDevice *aDevice)
 {
     AssertReturn(aDevice, VERR_GENERAL_FAILURE);
@@ -258 +258 @@
 
 
-bool USBProxyServiceLinux::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters,
+bool USBProxyBackendLinux::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters,
                                              SessionMachine **aIgnoreMachine)
 {
@@ -265 +265 @@
     AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
     if (    aUSBDevice->enmState == USBDEVICESTATE_USED_BY_HOST_CAPTURABLE
-        &&  aDevice->mUsb->enmState == USBDEVICESTATE_USED_BY_HOST)
+        &&  aDevice->i_getUsbData()->enmState == USBDEVICESTATE_USED_BY_HOST)
         LogRel(("USBProxy: Device %04x:%04x (%s) has become accessible.\n",
                 aUSBDevice->idVendor, aUSBDevice->idProduct, aUSBDevice->pszAddress));
@@ -278 +278 @@
  * See USBProxyService::deviceAdded for details.
  */
-void USBProxyServiceLinux::deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines,
+void USBProxyBackendLinux::deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines,
                                        PUSBDEVICE aUSBDevice)
 {
@@ -292 +292 @@
 
     devLock.release();
-    USBProxyService::deviceAdded(aDevice, llOpenedMachines, aUSBDevice);
-}
-
-
-int USBProxyServiceLinux::wait(RTMSINTERVAL aMillies)
+    USBProxyBackend::deviceAdded(aDevice, llOpenedMachines, aUSBDevice);
+}
+
+
+int USBProxyBackendLinux::wait(RTMSINTERVAL aMillies)
 {
     int rc;
@@ -312 +312 @@
 #define WAKE_UP_STRING_LEN  ( sizeof(WAKE_UP_STRING) - 1 )
 
-int USBProxyServiceLinux::waitUsbfs(RTMSINTERVAL aMillies)
+int USBProxyBackendLinux::waitUsbfs(RTMSINTERVAL aMillies)
 {
     struct pollfd PollFds[2];
@@ -347 +347 @@
 
 
-int USBProxyServiceLinux::waitSysfs(RTMSINTERVAL aMillies)
+int USBProxyBackendLinux::waitSysfs(RTMSINTERVAL aMillies)
 {
 #ifdef VBOX_USB_WITH_SYSFS
@@ -363 +363 @@
 
 
-int USBProxyServiceLinux::interruptWait(void)
+int USBProxyBackendLinux::interruptWait(void)
 {
     AssertReturn(!isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
@@ -385 +385 @@
 
 
-PUSBDEVICE USBProxyServiceLinux::getDevices(void)
+PUSBDEVICE USBProxyBackendLinux::getDevices(void)
 {
     return USBProxyLinuxGetDevices(mDevicesRoot.c_str(), !mUsingUsbfsDevices);