Changeset 52692 in vbox

Timestamp:

Sep 11, 2014 11:46:59 AM (10 years ago)

Author:

vboxsync

Message:

VMM: properly restore A20 from the saved state (fixes potential misbehavior after restoring a VM from a saved state with A20 disabled)

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PGMPhys.cpp (modified) (1 diff)
• PGMSavedState.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -3857 +3857 @@
     {
         pVCpu->pgm.s.fA20Enabled = fEnable;
-        pVCpu->pgm.s.GCPhysA20Mask = ~(RTGCPHYS)(!fEnable << 20);
+        pVCpu->pgm.s.GCPhysA20Mask = ~((RTGCPHYS)!fEnable << 20);
 #ifdef VBOX_WITH_REM
         REMR3A20Set(pVCpu->pVMR3, pVCpu, fEnable);

trunk/src/VBox/VMM/VMMR3/PGMSavedState.cpp

@@ -3075 +3075 @@
      */
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
-        pVM->aCpus[i].pgm.s.GCPhysA20Mask = ~(RTGCPHYS)(!pVM->aCpus[i].pgm.s.fA20Enabled << 20);
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+        pVCpu->pgm.s.GCPhysA20Mask = ~((RTGCPHYS)!pVM->aCpus[i].pgm.s.fA20Enabled << 20);
+        pgmR3RefreshShadowModeAfterA20Change(pVCpu);
+    }
 
     /*