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

Timestamp:

Dec 19, 2013 11:22:06 PM (11 years ago)

Author:

vboxsync

Message:

OHCI,EHCI: Fix save/restore issues keeping saved state compatibility

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (3 diffs)

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

@@ -5105 +5105 @@
         }
     }
+
+    /*
+     * If the bus was started set the timer. This is ugly but avoids changing the
+     * saved state version for now so we can backport the changes to other branches.
+     */
+    /** @todo: Do it properly for 4.4 by changing the saved state. */
+    if (pThis->fBusStarted)
+    {
+        /* Calculate a new timer expiration so this saved state works with older releases. */
+        uint64_t u64Expire = PDMDevHlpTMTimeVirtGet(pThis->CTX_SUFF(pDevIns)) + pThis->cTicksPerFrame;
+
+        LogFlowFunc(("Bus is active, setting timer to %llu\n", u64Expire));
+        int rc = TMTimerSet(pThis->pEndOfFrameTimerR3, u64Expire);
+        AssertRC(rc);
+    }
+
     PDMCritSectLeave(pThis->pDevInsR3->pCritSectRoR3);
 
@@ -5450 +5466 @@
 
 /**
+ * Resume notification.
+ *
+ * @returns VBox status.
+ * @param   pDevIns     The device instance data.
+ */
+static DECLCALLBACK(void) ohciR3Resume(PPDMDEVINS pDevIns)
+{
+    POHCI pThis = PDMINS_2_DATA(pDevIns, POHCI);
+    LogFlowFunc(("\n"));
+
+    /* Restart the frame thread if the timer is active. */
+    if (TMTimerIsActive(pThis->pEndOfFrameTimerR3))
+    {
+        int rc = TMTimerStop(pThis->pEndOfFrameTimerR3);
+        AssertRC(rc);
+
+        LogFlowFunc(("Bus was active, restart frame thread\n"));
+        ASMAtomicXchgBool(&pThis->fBusStarted, true);
+        RTSemEventSignal(pThis->hSemEventFrame);
+    }
+}
+
+
+/**
  * Info handler, device version. Dumps OHCI control registers.
  *
@@ -5770 +5810 @@
     NULL,
     /* pfnResume */
-    NULL,
+    ohciR3Resume,
     /* pfnAttach */
     NULL,