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

Timestamp:

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

Author:

vboxsync

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

150204

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

Location:

trunk/src/VBox/Devices/USB

Files:

• DrvVUSBRootHub.cpp (modified) (1 diff)
• VUSBDevice.cpp (modified) (4 diffs)
• VUSBInternal.h (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);

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

@@ -1033 +1033 @@
 
     /* Remove the device from the current address. */
-    if (pDev->u8Address == VUSB_DEFAULT_ADDRESS)
-    {
-        AssertPtr(pRh->apDevByAddr[VUSB_DEFAULT_ADDRESS]);
-
-        if (pDev == pRh->apDevByAddr[VUSB_DEFAULT_ADDRESS])
-            pRh->apDevByAddr[VUSB_DEFAULT_ADDRESS] = pDev->pNextDefAddr;
-        else
-        {
-            /* Search the list for the device and remove it. */
-            PVUSBDEV pDevPrev = pRh->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)
+    if (pDev->u8Address != VUSB_INVALID_ADDRESS)
+    {
+        Assert(pRh->apDevByAddr[VUSB_DEFAULT_ADDRESS] == pDev);
         pRh->apDevByAddr[pDev->u8Address] = NULL;
+    }
 
     if (u8Address == VUSB_DEFAULT_ADDRESS)
@@ -1063 +1045 @@
         if (pDevDef)
         {
+            pDevDef->u8Address = VUSB_INVALID_ADDRESS;
+            pDevDef->u8NewAddress = VUSB_INVALID_ADDRESS;
             vusbDevSetStateCmp(pDevDef, VUSB_DEVICE_STATE_POWERED, VUSB_DEVICE_STATE_DEFAULT);
             Log(("2 DEFAULT ADDRS\n"));
         }
 
-        pDev->pNextDefAddr = pDevDef;
         pRh->apDevByAddr[VUSB_DEFAULT_ADDRESS] = pDev;
         vusbDevSetState(pDev, VUSB_DEVICE_STATE_DEFAULT);
@@ -1078 +1061 @@
     }
 
+    pDev->u8Address = u8Address;
     RTCritSectLeave(&pRh->CritSectDevices);
-
-    pDev->u8Address = u8Address;
 
     Log(("vusb: %p[%s]/%i: Assigned address %u\n",
@@ -1807 +1789 @@
     pDev->IDevice.pfnGetSpeed = vusbIDeviceGetSpeed;
     pDev->pUsbIns = pUsbIns;
-    pDev->pNextDefAddr = NULL;
     pDev->pHub = NULL;
     pDev->enmState = VUSB_DEVICE_STATE_DETACHED;

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

@@ -225 +225 @@
     /** Pointer to the PDM USB device instance. */
     PPDMUSBINS          pUsbIns;
-    /** Next device in the chain of devices with the default address. */
-    PVUSBDEV            pNextDefAddr;
     /** Pointer to the hub this device is attached to. */
     PVUSBHUB            pHub;