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

Timestamp:

Jan 26, 2019 10:30:14 AM (6 years ago)

Author:

vboxsync

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

128422

Message:

Devices/USB: Create the USB I/O thread for each device during the attach phase (as it was destructed during a detach) to fix a debug assertion when saving a VM state where the device gets reattached during the process

Location:

trunk/src/VBox/Devices/USB

Files:

• DrvVUSBRootHub.cpp (modified) (1 diff)
• VUSBDevice.cpp (modified) (6 diffs)
• VUSBInternal.h (modified) (2 diffs)

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

@@ -234 +234 @@
 {
     LogFlow(("vusbHubAttach: pHub=%p[%s] pDev=%p[%s]\n", pHub, pHub->pszName, pDev, pDev->pUsbIns->pszName));
-    AssertMsg(pDev->enmState == VUSB_DEVICE_STATE_DETACHED, ("enmState=%d\n", pDev->enmState));
-
-    pDev->pHub = pHub;
-    pDev->enmState = VUSB_DEVICE_STATE_ATTACHED;
-
-    /* noone else ever messes with the default pipe while we are attached */
-    vusbDevMapEndpoint(pDev, &g_Endpoint0);
-    vusbDevDoSelectConfig(pDev, &g_Config0);
-
-    int rc = pHub->pOps->pfnAttach(pHub, pDev);
-    if (RT_FAILURE(rc))
-    {
-        pDev->pHub = NULL;
-        pDev->enmState = VUSB_DEVICE_STATE_DETACHED;
-    }
-    return rc;
+    return vusbDevAttach(pDev, pHub);
 }
 

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

@@ -1214 +1214 @@
 
 /**
+ * Attaches a device to the given hub.
+ *
+ * @returns VBox status code.
+ * @param   pDev        The device to attach.
+ * @param   pHub        THe hub to attach to.
+ */
+int vusbDevAttach(PVUSBDEV pDev, PVUSBHUB pHub)
+{
+    AssertMsg(pDev->enmState == VUSB_DEVICE_STATE_DETACHED, ("enmState=%d\n", pDev->enmState));
+
+    pDev->pHub = pHub;
+    pDev->enmState = VUSB_DEVICE_STATE_ATTACHED;
+
+    /* noone else ever messes with the default pipe while we are attached */
+    vusbDevMapEndpoint(pDev, &g_Endpoint0);
+    vusbDevDoSelectConfig(pDev, &g_Config0);
+
+    /* Create I/O thread and attach to the hub. */
+    int rc = vusbDevUrbIoThreadCreate(pDev);
+    if (RT_SUCCESS(rc))
+        rc = pHub->pOps->pfnAttach(pHub, pDev);
+
+    if (RT_FAILURE(rc))
+    {
+        pDev->pHub = NULL;
+        pDev->enmState = VUSB_DEVICE_STATE_DETACHED;
+    }
+
+    return rc;
+}
+
+
+/**
  * Detaches a device from the hub it's attached to.
  *
@@ -1245 +1278 @@
     vusbDevUrbIoThreadDestroy(pDev);
 
-    int rc = RTReqQueueDestroy(pDev->hReqQueueSync);
-    AssertRC(rc);
-    pDev->hReqQueueSync = NIL_RTREQQUEUE;
-
     vusbDevSetState(pDev, VUSB_DEVICE_STATE_DETACHED);
     pDev->pHub = NULL;
@@ -1283 +1312 @@
 
     vusbUrbPoolDestroy(&pDev->UrbPool);
+
+    int rc = RTReqQueueDestroy(pDev->hReqQueueSync);
+    AssertRC(rc);
+    pDev->hReqQueueSync = NIL_RTREQQUEUE;
 
     RTCritSectDelete(&pDev->CritSectAsyncUrbs);
@@ -1715 +1748 @@
 }
 
-
-static DECLCALLBACK(int) vusbDevGetDescriptorCacheWorker(PPDMUSBINS pUsbIns, PCPDMUSBDESCCACHE *ppDescCache)
-{
-    *ppDescCache = pUsbIns->pReg->pfnUsbGetDescriptorCache(pUsbIns);
-    return VINF_SUCCESS;
-}
 
 /**
@@ -1782 +1809 @@
     AssertRCReturn(rc, rc);
 
-    /* Create I/O thread. */
-    rc = vusbDevUrbIoThreadCreate(pDev);
-    AssertRCReturn(rc, rc);
-
     /*
      * Create the reset timer.
@@ -1802 +1825 @@
      * Get the descriptor cache from the device. (shall cannot fail)
      */
-    rc = vusbDevIoThreadExecSync(pDev, (PFNRT)vusbDevGetDescriptorCacheWorker, 2, pUsbIns, &pDev->pDescCache);
-    AssertRC(rc);
+    pDev->pDescCache = pUsbIns->pReg->pfnUsbGetDescriptorCache(pUsbIns);
     AssertPtr(pDev->pDescCache);
 #ifdef VBOX_STRICT

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

@@ -298 +298 @@
 void vusbDevMapEndpoint(PVUSBDEV dev, PCVUSBDESCENDPOINTEX ep);
 int vusbDevDetach(PVUSBDEV pDev);
+int vusbDevAttach(PVUSBDEV pDev, PVUSBHUB pHub);
 DECLINLINE(PVUSBROOTHUB) vusbDevGetRh(PVUSBDEV pDev);
 size_t vusbDevMaxInterfaces(PVUSBDEV dev);
@@ -738 +739 @@
 /** Strings for the CTLSTAGE enum values. */
 extern const char * const g_apszCtlStates[4];
-/** Default message pipe. */
-extern const VUSBDESCENDPOINTEX g_Endpoint0;
-/** Default configuration. */
-extern const VUSBDESCCONFIGEX g_Config0;
 
 RT_C_DECLS_END