Changeset 23780 in vbox

Timestamp:

Oct 14, 2009 10:07:18 PM (16 years ago)

Author:

vboxsync

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

53518

Message:

SSM: Adding IGN_GCPTR and IGN_GCPHYS just in case.

Location:

trunk

Files:

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

trunk/include/VBox/ssm.h

@@ -150 +150 @@
     /** Ignorable field. See SSMFIELD_ENTRY_IGNORE. */
     SSMFIELDTRANS_IGNORE,
-    /** Ignorable Host context (HC) virtual address. See SSMFIELD_ENTRY_HCPTR. */
+    /** Ignorable guest context (GC) virtual address. */
+    SSMFIELDTRANS_IGN_GCPTR,
+    /** Ignorable guest context (GC) physical address. */
+    SSMFIELDTRANS_IGN_GCPHYS,
+    /** Ignorable raw-mode context (RC) virtual address. */
+    SSMFIELDTRANS_IGN_RCPTR,
+    /** Ignorable host context (HC) virtual address.  */
     SSMFIELDTRANS_IGN_HCPTR,
 
@@ -249 +255 @@
  * 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. */
+/** Emit a SSMFIELD array entry for an ignorable RTGCPHYS type. */
+#define SSMFIELD_ENTRY_IGN_GCPHYS(Type, Field)      SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_IGN_GCPHYS)
+/** Emit a SSMFIELD array entry for an ignorable RTGCPHYS type. */
+#define SSMFIELD_ENTRY_IGN_GCPTR(Type, Field)       SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_IGN_GCPTR)
+/** Emit a SSMFIELD array entry for an ignorable raw-mode context pointer. */
+#define SSMFIELD_ENTRY_IGN_RCPTR(Type, Field)       SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_IGN_RCPTR)
+/** Emit a SSMFIELD array entry for an ignorable ring-3 or/and ring-0 pointer. */
 #define SSMFIELD_ENTRY_IGN_HCPTR(Type, Field)       SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_IGN_HCPTR)
 

trunk/src/VBox/VMM/SSM.cpp

@@ -3414 +3414 @@
                     }
                 }
+                break;
+
+            case SSMFIELDTRANS_IGN_GCPTR:
+                AssertMsgReturn(cbField == sizeof(RTGCPTR), ("%#x (%s)\n", cbField, pCur->pszName), VERR_SSM_FIELD_INVALID_SIZE);
+                if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
+                    rc = ssmR3DataWrite(pSSM, s_abZero, sizeof(RTGCPTR));
+                break;
+
+            case SSMFIELDTRANS_IGN_GCPHYS:
+                AssertMsgReturn(cbField == sizeof(RTGCPHYS), ("%#x (%s)\n", cbField, pCur->pszName), VERR_SSM_FIELD_INVALID_SIZE);
+                if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
+                    rc = ssmR3DataWrite(pSSM, s_abZero, sizeof(RTGCPHYS));
                 break;
 
@@ -6047 +6059 @@
                 break;
 
+            case SSMFIELDTRANS_IGN_GCPTR:
+                AssertMsgReturn(cbField == sizeof(RTGCPTR), ("%#x (%s)\n", cbField, pCur->pszName), VERR_SSM_FIELD_INVALID_SIZE);
+                if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
+                    rc = SSMR3Skip(pSSM, pSSM->u.Read.cbGCPtr);
+                break;
+
+            case SSMFIELDTRANS_IGN_GCPHYS:
+                AssertMsgReturn(cbField == sizeof(RTGCPHYS), ("%#x (%s)\n", cbField, pCur->pszName), VERR_SSM_FIELD_INVALID_SIZE);
+                if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
+                    rc = SSMR3Skip(pSSM, pSSM->u.Read.cbGCPhys);
+                break;
+
             case SSMFIELDTRANS_IGN_RCPTR:
                 AssertMsgReturn(cbField == sizeof(RTRCPTR), ("%#x (%s)\n", cbField, pCur->pszName), VERR_SSM_FIELD_INVALID_SIZE);