Changeset 11944

Timestamp:

09/01/08 19:33:18 (3 months ago)

Author:

vboxsync

Message:

Updates for state saving

Files:

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

trunk/include/VBox/ssm.h

@@ -459 +459 @@
-SSMR3DECL(int) SSMR3PutGCPtr(PSSMHANDLE pSSM, RTGCPTR GCPtr);
-SSMR3DECL(int) SSMR3PutGCUIntPtr(PSSMHANDLE pSSM, RTGCUINTPTR GCPtr);
+SSMR3DECL(int) SSMR3PutRCPtr(PSSMHANDLE pSSM, RTRCPTR RCPtr);
-SSMR3DECL(int) SSMR3PutHCUInt(PSSMHANDLE pSSM, RTHCUINT u);
-SSMR3DECL(int) SSMR3PutHCSInt(PSSMHANDLE pSSM, RTHCINT i);
@@ -493 +494 @@
-SSMR3DECL(int) SSMR3GetGCPtr(PSSMHANDLE pSSM, PRTGCPTR pGCPtr);
-SSMR3DECL(int) SSMR3GetGCUIntPtr(PSSMHANDLE pSSM, PRTGCUINTPTR pGCPtr);
+SSMR3DECL(int) SSMR3GetRCPtr(PSSMHANDLE pSSM, PRTRCPTR pRCPtr);
-SSMR3DECL(int) SSMR3GetIOPort(PSSMHANDLE pSSM, PRTIOPORT pIOPort);
-SSMR3DECL(int) SSMR3GetHCUInt(PSSMHANDLE pSSM, PRTHCUINT pu);

trunk/src/VBox/VMM/SSM.cpp

@@ -2315 +2315 @@
-
-/**
+ * Saves an RC virtual address item to the current data unit.
+ *
+ * @returns VBox status.
+ * @param   pSSM            SSM operation handle.
+ * @param   RCPtr           The item to save.
+ */
+SSMR3DECL(int) SSMR3PutRCPtr(PSSMHANDLE pSSM, RTRCPTR RCPtr)
+{
+    if (pSSM->enmOp == SSMSTATE_SAVE_EXEC)
+        return ssmr3Write(pSSM, &RCPtr, sizeof(RCPtr));
+    AssertMsgFailed(("Invalid state %d\n", pSSM->enmOp));
+    return VERR_SSM_INVALID_STATE;
+}
+
+
+/**
- * Saves a GC virtual address (represented as an unsigned integer) item to the current data unit.
- *
@@ -2899 +2915 @@
-{
-    Assert(cbGCPtr == sizeof(RTGCPTR32) || cbGCPtr == sizeof(RTGCPTR64));
+    Log(("SSMR3SetGCPtrSize %d bytes\n", cbGCPtr));
-    pSSM->cbGCPtr = cbGCPtr;
-    return VINF_SUCCESS;
@@ -2930 +2947 @@
-}
-
+/**
+ * Loads an RC virtual address item from the current data unit.
+ *
+ * @returns VBox status.
+ * @param   pSSM            SSM operation handle.
+ * @param   pRCPtr          Where to store the RC virtual address.
+ */
+SSMR3DECL(int) SSMR3GetRCPtr(PSSMHANDLE pSSM, PRTRCPTR pRCPtr)
+{
+    if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
+        return ssmr3Read(pSSM, pRCPtr, sizeof(*pRCPtr));
+
+    AssertMsgFailed(("Invalid state %d\n", pSSM->enmOp));
+    return VERR_SSM_INVALID_STATE;
+}
-
-/**

trunk/src/VBox/VMM/VMM.cpp

@@ -1606 +1606 @@
-     * The hypervisor stack.
-     */
-G
-G
+R
+R
-    AssertMsg(pVM->vmm.s.pbGCStackBottom - GCPtrESP <= VMM_STACK_SIZE, ("Bottom %VGv ESP=%VGv\n", pVM->vmm.s.pbGCStackBottom, GCPtrESP));
-G
+R
-    SSMR3PutMem(pSSM, pVM->vmm.s.pbHCStack, VMM_STACK_SIZE);
-    return SSMR3PutU32(pSSM, ~0); /* terminator */
@@ -1639 +1639 @@
-     * Check that the stack is in the same place, or that it's fearly empty.
-     */
-G
-G
-G
-G
+R
+R
+R
+R
-    if (VBOX_FAILURE(rc))
-        return rc;
@@ -1670 +1670 @@
-    }
-
-Gv pbGCStackBottom=%VGv ESP=%VG
+Rv pbGCStackBottom=%VRv ESP=%VR
-            GCPtrStackBottom, pVM->vmm.s.pbGCStackBottom, GCPtrESP));
-    if (SSMR3HandleGetAfter(pSSM) == SSMAFTER_DEBUG_IT)