Changeset 52766 in vbox

Timestamp:

Sep 16, 2014 4:21:44 PM (11 years ago)

Author:

vboxsync

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

96136

Message:

VMM/HM: Fixing source of ambiguity.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/HM.cpp (modified) (4 diffs)
• include/HMInternal.h (modified) (1 diff)

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

@@ -341 +341 @@
      * Register the saved state data unit.
      */
-    int rc = SSMR3RegisterInternal(pVM, "HWACCM", 0, HM_SSM_VERSION, sizeof(HM),
+    int rc = SSMR3RegisterInternal(pVM, "HWACCM", 0, HM_SAVED_STATE_VERSION, sizeof(HM),
                                    NULL, NULL, NULL,
                                    NULL, hmR3Save, NULL,
@@ -3080 +3080 @@
      * Validate version.
      */
-    if (   uVersion != HM_SSM_VERSION
-        && uVersion != HM_SSM_VERSION_NO_PATCHING
-        && uVersion != HM_SSM_VERSION_2_0_X)
+    if (   uVersion != HM_SAVED_STATE_VERSION
+        && uVersion != HM_SAVED_STATE_VERSION_NO_PATCHING
+        && uVersion != HM_SAVED_STATE_VERSION_2_0_X)
     {
         AssertMsgFailed(("hmR3Load: Invalid version uVersion=%d!\n", uVersion));
@@ -3096 +3096 @@
         AssertRCReturn(rc, rc);
 
-        if (uVersion >= HM_SSM_VERSION_NO_PATCHING)
+        if (uVersion >= HM_SAVED_STATE_VERSION_NO_PATCHING)
         {
             uint32_t val;
@@ -3109 +3109 @@
     }
 #ifdef VBOX_HM_WITH_GUEST_PATCHING
-    if (uVersion > HM_SSM_VERSION_NO_PATCHING)
+    if (uVersion > HM_SAVED_STATE_VERSION_NO_PATCHING)
     {
         rc = SSMR3GetGCPtr(pSSM, &pVM->hm.s.pGuestPatchMem);

trunk/src/VBox/VMM/include/HMInternal.h

@@ -225 +225 @@
  */
 #ifdef VBOX_HM_WITH_GUEST_PATCHING
-# define HM_SSM_VERSION                 5
-# define HM_SSM_VERSION_NO_PATCHING     4
+# define HM_SAVED_STATE_VERSION                 5
+# define HM_SAVED_STATE_VERSION_NO_PATCHING     4
 #else
-# define HM_SSM_VERSION                 4
-# define HM_SSM_VERSION_NO_PATCHING     4
-#endif
-#define HM_SSM_VERSION_2_0_X            3
+# define HM_SAVED_STATE_VERSION                 4
+# define HM_SAVED_STATE_VERSION_NO_PATCHING     4
+#endif
+#define HM_SAVED_STATE_VERSION_2_0_X            3
 
 /**