Changeset 42612 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Aug 6, 2012 10:11:28 AM (13 years ago)

Author:

vboxsync

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

79800

Message:

PGMR3Reset: Flush even more on reset if A20 was disabled.

File:

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

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

@@ -2564 +2564 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
-        pVCpu->pgm.s.fA20Enabled = true;
-        pVCpu->pgm.s.GCPhysA20Mask = ~((RTGCPHYS)!pVCpu->pgm.s.fA20Enabled << 20);
         pVCpu->pgm.s.fGst32BitPageSizeExtension = false;
         PGMNotifyNxeChanged(pVCpu, false);
@@ -2571 +2569 @@
         VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_PGM_SYNC_CR3);
         VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL);
+
+        if (!pVCpu->pgm.s.fA20Enabled)
+        {
+            pVCpu->pgm.s.fA20Enabled = true;
+            pVCpu->pgm.s.GCPhysA20Mask = ~((RTGCPHYS)!pVCpu->pgm.s.fA20Enabled << 20);
+#ifdef PGM_WITH_A20
+            pVCpu->pgm.s.fSyncFlags |= PGM_SYNC_UPDATE_PAGE_BIT_VIRTUAL;
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3);
+            pgmR3RefreshShadowModeAfterA20Change(pVCpu);
+            HWACCMFlushTLB(pVCpu);
+#endif
+        }
     }