Changeset 7865 in vbox for trunk/src/VBox

Timestamp:

Apr 10, 2008 12:21:06 PM (17 years ago)

Author:

vboxsync

Message:

Eliminate edge case where pVM->pgm.s.GCPhysCR3 would get out of sync. (VT-x & PAE only so far)

File:

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

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -32 +32 @@
 #include <VBox/rem.h>
 #include <VBox/em.h>
+#include <VBox/hwaccm.h>
 #include "PGMInternal.h"
 #include <VBox/vm.h>
@@ -916 +917 @@
      * we may still be called because of REM not caring/knowing this.
      * REM is simple and we wish to keep it that way.
-     */
-    if (pVM->pgm.s.enmGuestMode <= PGMMODE_PROTECTED)
+     *
+     * Note: We need to execute everything in hwaccm mode otherwise GCPhysCR3 can get out of sync.
+     *       (VT-x and switching between 32 bits paging & PAE hits this case)
+     */
+    if (    pVM->pgm.s.enmGuestMode <= PGMMODE_PROTECTED
+        &&  !HWACCMIsEnabled(pVM))
         return VINF_SUCCESS;
+
     LogFlow(("PGMFlushTLB: cr3=%#x OldCr3=%#x fGlobal=%d\n", cr3, pVM->pgm.s.GCPhysCR3, fGlobal));
     STAM_PROFILE_START(&pVM->pgm.s.StatFlushTLB, a);