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

Timestamp:

Mar 24, 2016 10:58:33 AM (9 years ago)

Author:

vboxsync

Message:

VUSB: Fix assertion and non working devices attached to OHCI after a VM restore

File:

• trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp (modified) (2 diffs)

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

@@ -898 +898 @@
         AssertRCReturn(rc, rc);
 
-        rc = PDMR3ThreadResume(pThis->hThreadPeriodFrame);
-        AssertRCReturn(rc, rc);
+        VMSTATE enmState = PDMDrvHlpVMState(pThis->pDrvIns);
+        if (   enmState == VMSTATE_RUNNING
+            || enmState == VMSTATE_RUNNING_LS
+            || enmState == VMSTATE_RUNNING_FT)
+        {
+            rc = PDMR3ThreadResume(pThis->hThreadPeriodFrame);
+            AssertRCReturn(rc, rc);
+        }
     }
     else if (   pThis->hThreadPeriodFrame
@@ -923 +929 @@
     {
         /* Just switch to the new frame rate and let the periodic frame thread pick it up. */
-        ASMAtomicXchgU32(&pThis->uFrameRateDefault, uFrameRate);
+        uint32_t uFrameRateOld = ASMAtomicXchgU32(&pThis->uFrameRateDefault, uFrameRate);
+
+        /* Signal the frame thread to continue if it was stopped. */
+        if (!uFrameRateOld)
+            RTSemEventMultiSignal(pThis->hSemEventPeriodFrame);
     }