Changeset 49092 in vbox for trunk/src

Timestamp:

Oct 14, 2013 10:01:16 PM (11 years ago)

Author:

vboxsync

Message:

VUSB,EHCI,OHCI: Add a method to query whether a device is emulated or not. Required for working saved states when using the MSD device

Location:

trunk/src/VBox

Files:

• Devices/USB/DevOHCI.cpp (modified) (4 diffs)
• VMM/VMMR3/PDMUsb.cpp (modified) (1 diff)

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

@@ -5003 +5003 @@
      */
     PDMCritSectEnter(pThis->pDevInsR3->pCritSectRoR3, VERR_IGNORED);
-    /** @todo we a) can't tell which are proxied, and b) this won't work well when continuing after saving! */
+    /** @todo this won't work well when continuing after saving! */
     for (unsigned i = 0; i < RT_ELEMENTS(pRh->aPorts); i++)
     {
@@ -5009 +5009 @@
         if (pDev)
         {
-            VUSBIRhDetachDevice(pRh->pIRhConn, pDev);
-            /*
-             * Save the device pointers here so we can reattach them afterwards.
-             * This will work fine even if the save fails since the Done handler is
-             * called unconditionally if the Prep handler was called.
-             */
-            pRh->aPorts[i].pDev = pDev;
+            if (!VUSBIDevIsEmulated(pDev))
+            {
+                VUSBIRhDetachDevice(pRh->pIRhConn, pDev);
+                /*
+                 * Save the device pointers here so we can reattach them afterwards.
+                 * This will work fine even if the save fails since the Done handler is
+                 * called unconditionally if the Prep handler was called.
+                 */
+                pRh->aPorts[i].pDev = pDev;
+            }
+            else /* Reap URBs one last time to make sure the lists are empty. */
+                VUSBIRhReapAsyncUrbs(pEhci->RootHub.pIRhConn, 0);
         }
     }
@@ -5080 +5085 @@
     {
         PVUSBIDEVICE pDev = Rh.aPorts[i].pDev;
-        if (pDev)
+        if (   pDev
+            && !VUSBIDevIsEmulated(pDev))
             VUSBIRhAttachDevice(pRh->pIRhConn, pDev);
     }
@@ -5118 +5124 @@
         {
             PVUSBIDEVICE pDev = pRh->aPorts[i].pDev;
-            if (pDev)
+            if (   pDev
+                && !VUSBIDevIsEmulated(pDev))
             {
                 Load.apDevs[Load.cDevs++] = pDev;

trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp

@@ -227 +227 @@
                     ("Invalid name '%.s'\n", sizeof(pReg->szName), pReg->szName),
                     VERR_PDM_INVALID_USB_REGISTRATION);
-    AssertMsgReturn((pReg->fFlags & ~(PDM_USBREG_HIGHSPEED_CAPABLE)) == 0,
+    AssertMsgReturn((pReg->fFlags & ~(PDM_USBREG_HIGHSPEED_CAPABLE | PDM_USBREG_EMULATED_DEVICE)) == 0,
                     ("fFlags=%#x\n", pReg->fFlags), VERR_PDM_INVALID_USB_REGISTRATION);
     AssertMsgReturn(pReg->cMaxInstances > 0,