Changeset 14563 in vbox

Timestamp:

Nov 25, 2008 11:04:27 AM (16 years ago)

Author:

vboxsync

Message:

Reinitialize paging modes correctly when loading the saved state.

File:

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

trunk/src/VBox/VMM/HWACCM.cpp

@@ -791 +791 @@
 {
     Log(("HWACCMR3Relocate to %RGv\n", MMHyperGetArea(pVM, 0)));
+
+    /* Fetch the current paging mode during the relocate callback during state loading. */
+    if (VMR3GetState(pVM) == VMSTATE_LOADING)
+    {
+        for (unsigned i=0;i<pVM->cCPUs;i++)
+        {
+            PVMCPU pVCpu = &pVM->aCpus[i];
+            /* @todo SMP */
+            pVCpu->hwaccm.s.enmShadowMode        = PGMGetShadowMode(pVM);
+            pVCpu->hwaccm.s.vmx.enmCurrGuestMode = PGMGetGuestMode(pVM);
+        }
+    }
+
     return;
 }
@@ -817 +830 @@
 VMMR3DECL(void) HWACCMR3PagingModeChanged(PVM pVM, PGMMODE enmShadowMode, PGMMODE enmGuestMode)
 {
+    /* Ignore page mode changes during state loading. */
+    if (VMR3GetState(pVM) == VMSTATE_LOADING)
+        return;
+
     PVMCPU pVCpu = VMMGetCpu(pVM);
     pVCpu->hwaccm.s.enmShadowMode = enmShadowMode;