Changeset 65896 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Feb 28, 2017 12:17:31 PM (8 years ago)

Author:

vboxsync

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

113688

Message:

VMM: Add TMR3TimerSkip to skip a saved timer state in a given SSM stream (for saved state comptibility if timers get removed)

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• TM.cpp (modified) (1 diff)
• VMMR3.def (modified) (1 diff)

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

@@ -2690 +2690 @@
 
 /**
+ * Skips the state of a timer in a given saved state.
+ *
+ * @returns VBox status.
+ * @param   pSSM            Save State Manager handle.
+ * @param   pfActive        Where to store whether the timer was active
+ *                          when the state was saved.
+ */
+VMMR3DECL(int) TMR3TimerSkip(PSSMHANDLE pSSM, bool *pfActive)
+{
+    Assert(pSSM); AssertPtr(pfActive);
+    LogFlow(("TMR3TimerSkip: pSSM=%p pfActive=%p\n", pSSM, pfActive));
+
+    /*
+     * Load the state and validate it.
+     */
+    uint8_t u8State;
+    int rc = SSMR3GetU8(pSSM, &u8State);
+    if (RT_FAILURE(rc))
+        return rc;
+#if 1 /* Workaround for accidental state shift in r47786 (2009-05-26 19:12:12). */  /** @todo remove this in a few weeks! */
+    if (    u8State == TMTIMERSTATE_SAVED_PENDING_STOP + 1
+        ||  u8State == TMTIMERSTATE_SAVED_PENDING_SCHEDULE + 1)
+        u8State--;
+#endif
+    if (    u8State != TMTIMERSTATE_SAVED_PENDING_STOP
+        &&  u8State != TMTIMERSTATE_SAVED_PENDING_SCHEDULE)
+    {
+        AssertLogRelMsgFailed(("u8State=%d\n", u8State));
+        return SSMR3HandleSetStatus(pSSM, VERR_TM_LOAD_STATE);
+    }
+
+    *pfActive = (u8State == TMTIMERSTATE_SAVED_PENDING_SCHEDULE);
+    if (*pfActive)
+    {
+        /*
+         * Load the expire time.
+         */
+        uint64_t u64Expire;
+        rc = SSMR3GetU64(pSSM, &u64Expire);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+
+    /*
+     * On failure set SSM status.
+     */
+    if (RT_FAILURE(rc))
+        rc = SSMR3HandleSetStatus(pSSM, rc);
+    return rc;
+}
+
+
+/**
  * Associates a critical section with a timer.
  *

trunk/src/VBox/VMM/VMMR3/VMMR3.def

@@ -356 +356 @@
     TMR3TimerLoad
     TMR3TimerSave
+    TMR3TimerSkip
     TMR3TimerDestroy
     TMTimerFromMicro