Changeset 45755 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 26, 2013 4:04:44 AM (12 years ago)

Author:

vboxsync

Message:

VBox/USB: fix in common USB code for device detachment.

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBDevice.cpp (modified) (1 diff)
• VUSBUrb.cpp (modified) (2 diffs)

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

@@ -1102 +1102 @@
                                  pUrb->pszDesc, pUrb->enmState, pDev, pDev->pUsbIns->pszName));
                 vusbUrbUnlink(pUrb);
+                /* Unlink isn't enough, because boundary timer and detaching will try to reap it. 
+                 * It was tested with MSD & iphone attachment to vSMP guest, if 
+                 * it breaks anything, please add comment here, why we should unlink only.
+                 */
+                pUrb->VUsb.pfnFree(pUrb);
             }
             pUrb = pNext;

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

@@ -760 +760 @@
         &&  (fComplete || !(pSetup->bmRequestType >> 7))
         &&  pDev
+        &&  pDev->pDescCache
         &&  pDev->pDescCache->pDevice
         &&  pDev->pDescCache->pDevice->idVendor == 0x046d
@@ -1961 +1962 @@
              */
             PVUSBURB pRipe;
-            while ((pRipe = pDev->pUsbIns->pReg->pfnUrbReap(pDev->pUsbIns, cMillies)) != NULL)
+            
+            /**
+             * This is workaround for race(should be fixed) detach on one EMT thread and frame boundary timer on other 
+             * and leaked URBs (shouldn't be affected by leaked URBs).
+             */
+            Assert(pDev->pUsbIns);
+            while (   pDev->pUsbIns 
+                   && ((pRipe = pDev->pUsbIns->pReg->pfnUrbReap(pDev->pUsbIns, cMillies)) != NULL))
             {
                 vusbUrbAssert(pRipe);