Changeset 59117 in vbox for trunk/src/VBox/Devices/USB

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/Devices/USB

Files:

• USBProxyDevice.cpp (modified) (3 diffs)
• USBProxyDevice.h (modified) (1 diff)

trunk/src/VBox/Devices/USB/USBProxyDevice.cpp

@@ -40 +40 @@
 static char g_szDummyName[] = "proxy xxxx:yyyy";
 
-
+/**
+ * Array of supported proxy backends.
+ */
+static PCUSBPROXYBACK g_aUsbProxies[] =
+{
+    &g_USBProxyDeviceHost,
+    &g_USBProxyDeviceVRDP,
+    &g_USBProxyDeviceUsbIp
+};
 
 /* Synchronously obtain a standard USB descriptor for a device, used in order
@@ -847 +855 @@
     AssertRCReturn(rc, rc);
 
-    bool fRemote;
-    rc = CFGMR3QueryBool(pCfg, "Remote", &fRemote);
+    char szBackend[64];
+    rc = CFGMR3QueryString(pCfg, "Backend", szBackend, sizeof(szBackend));
     AssertRCReturn(rc, rc);
 
@@ -858 +866 @@
      * Select backend and open the device.
      */
-    if (!fRemote)
-        pThis->pOps = &g_USBProxyDeviceHost;
-    else
-        pThis->pOps = &g_USBProxyDeviceVRDP;
+    rc = VERR_NOT_FOUND;
+    for (unsigned i = 0; i < RT_ELEMENTS(g_aUsbProxies); i++)
+    {
+        if (!RTStrICmp(szBackend, g_aUsbProxies[i]->pszName))
+        {
+            pThis->pOps = g_aUsbProxies[i];
+            rc = VINF_SUCCESS;
+            break;
+        }
+    }
+    if (RT_FAILURE(rc))
+        return PDMUSB_SET_ERROR(pUsbIns, rc, N_("USBProxy: Failed to find backend"));
 
     pThis->pvInstanceDataR3 = RTMemAllocZ(pThis->pOps->cbBackend);

trunk/src/VBox/Devices/USB/USBProxyDevice.h

@@ -175 +175 @@
 /** The remote desktop backend. */
 extern const USBPROXYBACK g_USBProxyDeviceVRDP;
+/** The USB/IP backend. */
+extern const USBPROXYBACK g_USBProxyDeviceUsbIp;
 
 #ifdef RDESKTOP