Changeset 23777 in vbox

Timestamp:

Oct 14, 2009 9:39:19 PM (15 years ago)

Author:

vboxsync

Message:

SSM,CSAM: More systematic naming SSMFIELDTRANS_HCPTR -> SSMFIELDTRANS_IGN_HCPTR and SSMFIELD_ENTRY_HCPTR -> SSMFIELD_ENTRY_IGN_HCPTR.

Location:

trunk

Files:

• include/VBox/ssm.h (modified) (2 diffs)
• src/VBox/VMM/PATM/CSAM.cpp (modified) (3 diffs)
• src/VBox/VMM/SSM.cpp (modified) (3 diffs)

trunk/include/VBox/ssm.h

@@ -147 +147 @@
     /** Array of SSMFIELDTRANS_HCPTR_NI. */
     SSMFIELDTRANS_HCPTR_NI_ARRAY,
-    /** Ignorable Host context (HC) virtual address. See SSMFIELD_ENTRY_HCPTR. */
-    SSMFIELDTRANS_HCPTR,
+
     /** Ignorable field. See SSMFIELD_ENTRY_IGNORE. */
     SSMFIELDTRANS_IGNORE,
+    /** Ignorable Host context (HC) virtual address. See SSMFIELD_ENTRY_HCPTR. */
+    SSMFIELDTRANS_IGN_HCPTR,
+
     /** Padding that differs between 32-bit and 64-bit hosts.
      * The first  byte of SSMFIELD::cb contains the size for 32-bit hosts.
@@ -242 +244 @@
 /** Same as SSMFIELD_ENTRY_HCPTR_NI, except it's an array of the buggers. */
 #define SSMFIELD_ENTRY_HCPTR_NI_ARRAY(Type, Field)  SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_HCPTR_NI_ARRAY)
-/** Emit a SSMFIELD array entry for a ring-0 or ring-3 pointer type that is
- * of no real interest to the saved state.  It follows the same save and restore
- * rules as SSMFIELD_ENTRY_IGNORE. */
-#define SSMFIELD_ENTRY_HCPTR(Type, Field)           SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_HCPTR)
+
 /** Emit a SSMFIELD array entry for a field that can be ignored.
  * It is stored as zeros if SSMSTRUCT_FLAGS_DONT_IGNORE is specified to
  * SSMR3PutStructEx.  The member is never touched upon restore. */
 #define SSMFIELD_ENTRY_IGNORE(Type, Field)          SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_IGNORE)
+/** Emit a SSMFIELD array entry for a ring-0 or ring-3 pointer type that is
+ * of no real interest to the saved state.  It follows the same save and restore
+ * rules as SSMFIELD_ENTRY_IGNORE. */
+#define SSMFIELD_ENTRY_IGN_HCPTR(Type, Field)       SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_IGN_HCPTR)
+
 /** Emit a SSMFIELD array entry for a padding that differs in size between
  * 64-bit and 32-bit hosts. */

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

@@ -109 +109 @@
     SSMFIELD_ENTRY_IGNORE(      CSAM, offVM),
     SSMFIELD_ENTRY_PAD_HC64(    CSAM, Alignment0, sizeof(uint32_t)),
-    SSMFIELD_ENTRY_HCPTR(       CSAM, pPageTree),
+    SSMFIELD_ENTRY_IGN_HCPTR(   CSAM, pPageTree),
     SSMFIELD_ENTRY(             CSAM, aDangerousInstr),
     SSMFIELD_ENTRY(             CSAM, cDangerousInstr),
@@ -115 +115 @@
     SSMFIELD_ENTRY_RCPTR(       CSAM, pPDBitmapGC),
     SSMFIELD_ENTRY_RCPTR(       CSAM, pPDHCBitmapGC),
-    SSMFIELD_ENTRY_HCPTR(       CSAM, pPDBitmapHC),
-    SSMFIELD_ENTRY_HCPTR(       CSAM, pPDGCBitmapHC),
-    SSMFIELD_ENTRY_HCPTR(       CSAM, savedstate.pSSM),
+    SSMFIELD_ENTRY_IGN_HCPTR(   CSAM, pPDBitmapHC),
+    SSMFIELD_ENTRY_IGN_HCPTR(   CSAM, pPDGCBitmapHC),
+    SSMFIELD_ENTRY_IGN_HCPTR(   CSAM, savedstate.pSSM),
     SSMFIELD_ENTRY(             CSAM, savedstate.cPageRecords),
     SSMFIELD_ENTRY(             CSAM, savedstate.cPatchPageRecords),
@@ -187 +187 @@
 static const SSMFIELD g_aCsamPageRecFields[] =
 {
-    SSMFIELD_ENTRY_HCPTR(       CSAMPAGEREC, Core.Key),
-    SSMFIELD_ENTRY_HCPTR(       CSAMPAGEREC, Core.pLeft),
-    SSMFIELD_ENTRY_HCPTR(       CSAMPAGEREC, Core.pRight),
+    SSMFIELD_ENTRY_IGN_HCPTR(   CSAMPAGEREC, Core.Key),
+    SSMFIELD_ENTRY_IGN_HCPTR(   CSAMPAGEREC, Core.pLeft),
+    SSMFIELD_ENTRY_IGN_HCPTR(   CSAMPAGEREC, Core.pRight),
     SSMFIELD_ENTRY_IGNORE(      CSAMPAGEREC, Core.uchHeight),
     SSMFIELD_ENTRY_PAD_HC_AUTO( 3, 7),

trunk/src/VBox/VMM/SSM.cpp

@@ -3404 +3404 @@
             }
 
-            case SSMFIELDTRANS_HCPTR:
-                AssertMsgReturn(cbField == sizeof(void *), ("%#x (%s)\n", cbField, pCur->pszName), VERR_SSM_FIELD_INVALID_SIZE);
-                if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
-                    rc = ssmR3DataWrite(pSSM, s_abZero, sizeof(void *));
-                break;
-
             case SSMFIELDTRANS_IGNORE:
                 if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
@@ -3421 +3415 @@
                 }
                 break;
+
+            case SSMFIELDTRANS_IGN_HCPTR:
+                AssertMsgReturn(cbField == sizeof(void *), ("%#x (%s)\n", cbField, pCur->pszName), VERR_SSM_FIELD_INVALID_SIZE);
+                if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
+                    rc = ssmR3DataWrite(pSSM, s_abZero, sizeof(void *));
+                break;
+
 
             case SSMFIELDTRANS_PAD_HC:
@@ -6036 +6037 @@
             }
 
-            case SSMFIELDTRANS_HCPTR:
+            case SSMFIELDTRANS_IGNORE:
+                if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
+                    rc = SSMR3Skip(pSSM, cbField);
+                break;
+
+            case SSMFIELDTRANS_IGN_HCPTR:
                 AssertMsgReturn(cbField == sizeof(void *), ("%#x (%s)\n", cbField, pCur->pszName), VERR_SSM_FIELD_INVALID_SIZE);
                 if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
                     rc = SSMR3Skip(pSSM, ssmR3GetHostBits(pSSM) / 8);
-                break;
-
-            case SSMFIELDTRANS_IGNORE:
-                if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
-                    rc = SSMR3Skip(pSSM, cbField);
                 break;