Changeset 19436 in vbox for trunk/src/VBox

Timestamp:

May 6, 2009 2:33:49 PM (16 years ago)

Author:

vboxsync

Message:

VMM.cpp: Not necessary to save the new stacks (see comment in vmmR3Load). Save and restore the essence of VMCPU::enmState.

File:

• trunk/src/VBox/VMM/VMM.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMM.cpp

@@ -219 +219 @@
     int rc = VINF_SUCCESS;
 
-    for (unsigned idCpu = 0; idCpu < pVM->cCPUs; idCpu++)
+    for (VMCPUID idCpu = 0; idCpu < pVM->cCPUs; idCpu++)
     {
         PVMCPU pVCpu = &pVM->aCpus[idCpu];
@@ -392 +392 @@
     int rc = VINF_SUCCESS;
 
-    for (unsigned idCpu = 0; idCpu < pVM->cCPUs; idCpu++)
+    for (VMCPUID idCpu = 0; idCpu < pVM->cCPUs; idCpu++)
     {
         PVMCPU pVCpu = &pVM->aCpus[idCpu];
@@ -660 +660 @@
      * The stack.
      */
-    for (unsigned i=0;i<pVM->cCPUs;i++)
+    for (VMCPUID i = 0; i < pVM->cCPUs; i++)
     {
         PVMCPU pVCpu = &pVM->aCpus[i];
@@ -669 +669 @@
         pVCpu->vmm.s.pbEMTStackBottomRC = pVCpu->vmm.s.pbEMTStackRC + VMM_STACK_SIZE;
     }
-
 
     /*
@@ -826 +825 @@
     LogFlow(("vmmR3Save:\n"));
 
-    for (unsigned i=0;i<pVM->cCPUs;i++)
-    {
-        PVMCPU pVCpu = &pVM->aCpus[i];
-
-        /*
-         * The hypervisor stack.
-         * Note! See not in vmmR3Load.
-         */
-        SSMR3PutRCPtr(pSSM, pVCpu->vmm.s.pbEMTStackBottomRC);
-
-        RTRCPTR RCPtrESP = CPUMGetHyperESP(pVCpu);
-        AssertMsg(pVCpu->vmm.s.pbEMTStackBottomRC - RCPtrESP <= VMM_STACK_SIZE, ("Bottom %RRv ESP=%RRv\n", pVCpu->vmm.s.pbEMTStackBottomRC, RCPtrESP));
-        SSMR3PutRCPtr(pSSM, RCPtrESP);
-
-        SSMR3PutMem(pSSM, pVCpu->vmm.s.pbEMTStackR3, VMM_STACK_SIZE);
-    }
+    /*
+     * The hypervisor stack.
+     * Note! See note in vmmR3Load (remove this on version change).
+     */
+    PVMCPU pVCpu0 = &pVM->aCpus[0];
+    SSMR3PutRCPtr(pSSM, pVCpu0->vmm.s.pbEMTStackBottomRC);
+    RTRCPTR RCPtrESP = CPUMGetHyperESP(pVCpu0);
+    AssertMsg(pVCpu0->vmm.s.pbEMTStackBottomRC - RCPtrESP <= VMM_STACK_SIZE, ("Bottom %RRv ESP=%RRv\n", pVCpu0->vmm.s.pbEMTStackBottomRC, RCPtrESP));
+    SSMR3PutRCPtr(pSSM, RCPtrESP);
+    SSMR3PutMem(pSSM, pVCpu0->vmm.s.pbEMTStackR3, VMM_STACK_SIZE);
+
+    /*
+     * Save the started/stopped state of all CPUs except 0 as it will always
+     * be running. This avoids breaking the saved state version. :-)
+     */
+    for (VMCPUID i = 1; i < pVM->cCPUs; i++)
+        SSMR3PutBool(pSSM, VMCPUSTATE_IS_STARTED(VMCPU_GET_STATE(&pVM->aCpus[i])));
+
     return SSMR3PutU32(pSSM, ~0); /* terminator */
 }
@@ -880 +881 @@
     if (RT_FAILURE(rc))
         return rc;
-
-    /* restore the stack.  */
-    for (unsigned i=0;i<pVM->cCPUs;i++)
-    {
-        PVMCPU pVCpu = &pVM->aCpus[i];
-
-        SSMR3GetMem(pSSM, pVCpu->vmm.s.pbEMTStackR3, VMM_STACK_SIZE);
+    SSMR3GetMem(pSSM, pVM->aCpus[0].vmm.s.pbEMTStackR3, VMM_STACK_SIZE);
+
+    /* Restore the VMCPU states. VCPU 0 is always started. */
+    VMCPU_SET_STATE(&pVM->aCpus[0], VMCPUSTATE_STARTED);
+    for (VMCPUID i = 1; i < pVM->cCPUs; i++)
+    {
+        bool fStarted;
+        rc = SSMR3GetBool(pSSM, &fStarted);
+        if (RT_FAILURE(rc))
+            return rc;
+        VMCPU_SET_STATE(&pVM->aCpus[i], fStarted ? VMCPUSTATE_STARTED : VMCPUSTATE_STOPPED);
     }