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

Timestamp:

Feb 28, 2017 2:34:11 PM (8 years ago)

Author:

vboxsync

Message:

TMR3TimerSkip: No need to to set ssm handle status on failure when the error came from an SSM API.
TMR3TimerSkip,TMR3TimerLoad: Clearified the r47786 workaround.

File:

• trunk/src/VBox/VMM/VMMR3/TM.cpp (modified) (3 diffs)

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

@@ -2631 +2631 @@
     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! */
+
+    /* TMTIMERSTATE_SAVED_XXX: Workaround for accidental state shift in r47786 (2009-05-26 19:12:12). */
     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)
@@ -2709 +2710 @@
     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! */
+
+    /* TMTIMERSTATE_SAVED_XXX: Workaround for accidental state shift in r47786 (2009-05-26 19:12:12). */
     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)
@@ -2729 +2731 @@
         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;
 }