Changeset 52771 in vbox

Timestamp:

Sep 17, 2014 11:32:33 AM (10 years ago)

Author:

vboxsync

Message:

VMM/CSAM, PATM: rename SSM_VERSION macros to SAVED_STATE_VERSION macros.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/CSAM.cpp (modified) (3 diffs)
• VMMR3/PATM.cpp (modified) (2 diffs)
• VMMR3/PATMSSM.cpp (modified) (9 diffs)
• include/CSAMInternal.h (modified) (2 diffs)
• include/PATMInternal.h (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -253 +253 @@
      * Register save and load state notifiers.
      */
-    rc = SSMR3RegisterInternal(pVM, "CSAM", 0, CSAM_SSM_VERSION, sizeof(pVM->csam.s) + PAGE_SIZE*16,
+    rc = SSMR3RegisterInternal(pVM, "CSAM", 0, CSAM_SAVED_STATE_VERSION, sizeof(pVM->csam.s) + PAGE_SIZE*16,
                                NULL, NULL, NULL,
                                NULL, csamr3Save, NULL,
@@ -580 +580 @@
 
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
-    if (uVersion != CSAM_SSM_VERSION)
+    if (uVersion != CSAM_SAVED_STATE_VERSION)
     {
         AssertMsgFailed(("csamR3Load: Invalid version uVersion=%d!\n", uVersion));

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -220 +220 @@
      * Register save and load state notifiers.
      */
-    rc = SSMR3RegisterInternal(pVM, "PATM", 0, PATM_SSM_VERSION, sizeof(pVM->patm.s) + PATCH_MEMORY_SIZE  + PAGE_SIZE + PATM_STACK_TOTAL_SIZE + PAGE_SIZE,
+    rc = SSMR3RegisterInternal(pVM, "PATM", 0, PATM_SAVED_STATE_VERSION, sizeof(pVM->patm.s) + PATCH_MEMORY_SIZE  + PAGE_SIZE + PATM_STACK_TOTAL_SIZE + PAGE_SIZE,
                                NULL, NULL, NULL,
                                NULL, patmR3Save, NULL,

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -817 +817 @@
     int  rc;
 
-    if (    uVersion != PATM_SSM_VERSION
-        &&  uVersion != PATM_SSM_VERSION_MEM
-        &&  uVersion != PATM_SSM_VERSION_FIXUP_HACK
-        &&  uVersion != PATM_SSM_VERSION_VER16
+    if (    uVersion != PATM_SAVED_STATE_VERSION
+        &&  uVersion != PATM_SAVED_STATE_VERSION_MEM
+        &&  uVersion != PATM_SAVED_STATE_VERSION_FIXUP_HACK
+        &&  uVersion != PATM_SAVED_STATE_VERSION_VER16
        )
     {
@@ -826 +826 @@
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     }
-    uint32_t const fStructRestoreFlags = uVersion <= PATM_SSM_VERSION_MEM ? SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED : 0;
+    uint32_t const fStructRestoreFlags = uVersion <= PATM_SAVED_STATE_VERSION_MEM ? SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED : 0;
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
@@ -835 +835 @@
      */
     RT_ZERO(patmInfo);
-    if (   uVersion == PATM_SSM_VERSION_MEM
+    if (   uVersion == PATM_SAVED_STATE_VERSION_MEM
         && SSMR3HandleRevision(pSSM) >= 86139
         && SSMR3HandleVersion(pSSM)  >= VBOX_FULL_VERSION_MAKE(4, 2, 51))
@@ -898 +898 @@
      */
     uint32_t cbStack = PATM_STACK_TOTAL_SIZE;
-    if (uVersion > PATM_SSM_VERSION_MEM)
+    if (uVersion > PATM_SAVED_STATE_VERSION_MEM)
     {
         rc = SSMR3GetU32(pSSM, &cbStack);
@@ -1137 +1137 @@
 
             /* The CPUMCTX structure has completely changed, so correct the offsets too. */
-            if (ulSSMVersion == PATM_SSM_VERSION_VER16)
+            if (ulSSMVersion == PATM_SAVED_STATE_VERSION_VER16)
             {
                 unsigned uCPUMOffset = *pFixup - patmInfo.pCPUMCtxGC;
@@ -1268 +1268 @@
          *    structure.
          * 3. That the CPUM leafs are less than 8KB into the structure. */
-        if (    ulSSMVersion <= PATM_SSM_VERSION_FIXUP_HACK
+        if (    ulSSMVersion <= PATM_SAVED_STATE_VERSION_FIXUP_HACK
             &&  *pFixup - (patmInfo.pCPUMCtxGC & UINT32_C(0xffc00000)) < UINT32_C(32))
         {
@@ -1275 +1275 @@
         }
         else
-        if (    ulSSMVersion <= PATM_SSM_VERSION_FIXUP_HACK
+        if (    ulSSMVersion <= PATM_SAVED_STATE_VERSION_FIXUP_HACK
             &&  *pFixup - (patmInfo.pCPUMCtxGC & UINT32_C(0xffc00000)) < UINT32_C(8192))
         {
@@ -1302 +1302 @@
         }
         else
-        if (ulSSMVersion >= PATM_SSM_VERSION_MEM)
+        if (ulSSMVersion >= PATM_SAVED_STATE_VERSION_MEM)
         {
 #ifdef LOG_ENABLED

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -39 +39 @@
 /** @} */
 
-#define CSAM_SSM_VERSION                        14
+#define CSAM_SAVED_STATE_VERSION                14
 
 #define CSAM_PGDIRBMP_CHUNKS                    1024

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
  * @{ */
 /** Uses normal structure serialization with markers and everything. */
-#define PATM_SSM_VERSION                    56
+#define PATM_SAVED_STATE_VERSION                    56
 /** Last version which saves structures as raw memory. */
-#define PATM_SSM_VERSION_MEM                55
-#define PATM_SSM_VERSION_FIXUP_HACK         54
-#define PATM_SSM_VERSION_FIXUP_HACK         54
-#define PATM_SSM_VERSION_VER16              53
+#define PATM_SAVED_STATE_VERSION_MEM                55
+#define PATM_SAVED_STATE_VERSION_FIXUP_HACK         54
+#define PATM_SAVED_STATE_VERSION_FIXUP_HACK         54
+#define PATM_SAVED_STATE_VERSION_VER16              53
 /** @}  */