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

Timestamp:

Feb 28, 2017 3:00:12 PM (8 years ago)

Author:

vboxsync

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

113694

Message:

Reapplied r113096 (backed out in r113137) in disabled form so it's not forgotten/lost: PGM: Reset GCPhysCR3 when unmapping CR3.

File:

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

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

@@ -2549 +2549 @@
     int rc = PGM_GST_PFN(Exit, pVCpu)(pVCpu);
     AssertRC(rc);
+#ifdef REMEMBER_TO_ENABLE_THESE_GCPhycCR3_NIL_ASSIGNMENTS /** @todo Enable r113096 and fix. */
+    pVCpu->pgm.s.GCPhysCR3 = NIL_RTGCPHYS;
+#endif
 
     rc = PGMR3ChangeMode(pVM, pVCpu, PGMMODE_REAL);
@@ -2603 +2606 @@
         int rc = PGM_GST_PFN(Exit, pVCpu)(pVCpu);
         AssertReleaseRC(rc);
+#ifdef REMEMBER_TO_ENABLE_THESE_GCPhycCR3_NIL_ASSIGNMENTS /** @todo Enable r113096 and fix. */
+        pVCpu->pgm.s.GCPhysCR3 = NIL_RTGCPHYS;
+#endif
     }
 
@@ -3514 +3520 @@
         }
     }
+#ifdef REMEMBER_TO_ENABLE_THESE_GCPhycCR3_NIL_ASSIGNMENTS /** @todo Enable r113096 and fix. */
+    pVCpu->pgm.s.GCPhysCR3 = NIL_RTGCPHYS;
+#endif
 
     /*
@@ -3740 +3749 @@
     int rc = PGM_BTH_PFN(UnmapCR3, pVCpu)(pVCpu);
     AssertRC(rc);
+#ifdef REMEMBER_TO_ENABLE_THESE_GCPhycCR3_NIL_ASSIGNMENTS /** @todo Enable r113096 and fix. */
+    pVCpu->pgm.s.GCPhysCR3 = NIL_RTGCPHYS;
+#endif
 
     /* Exit the current shadow paging mode as well; nested paging and EPT use a root CR3 which will get flushed here. */