Changeset 93974 in vbox for trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp

Timestamp:

Feb 28, 2022 12:03:21 PM (3 years ago)

Author:

vboxsync

Message:

Devices/USB: Fix for regression introduced with r150168 where a guest failed to enumerate USB devices if more than one device was on the bus when the VM was powered on. Simplify the code even more to not require any lists for devices in the default state, bugref:10196

File:

• trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp (modified) (1 diff)

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

@@ -430 +430 @@
     pThis->apDevByPort[uPort]  = NULL;
 
-    if (pDev->u8Address == VUSB_DEFAULT_ADDRESS)
-    {
-        AssertPtr(pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS]);
-
-        if (pDev == pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS])
-            pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS] = pDev->pNextDefAddr;
-        else
-        {
-            /* Search the list for the device and remove it. */
-            PVUSBDEV pDevPrev = pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS];
-
-            while (   pDevPrev
-                   && pDevPrev->pNextDefAddr != pDev)
-                pDevPrev = pDevPrev->pNextDefAddr;
-
-            AssertPtr(pDevPrev);
-            pDevPrev->pNextDefAddr = pDev->pNextDefAddr;
-        }
-
-        pDev->pNextDefAddr = NULL;
-    }
-    else
+    if (pDev->u8Address != VUSB_INVALID_ADDRESS)
     {
         Assert(pThis->apDevByAddr[pDev->u8Address] == pDev);