Changeset 16679 in vbox for trunk/src

Timestamp:

Feb 11, 2009 4:32:06 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: PGMGetHyperCR3 fix for EPT

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAll.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)

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

@@ -1376 +1376 @@
 {
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    return pVM->pgm.s.HCPhysShwCR3;
+    PGMMODE enmShadowMode = pVM->pgm.s.enmShadowMode;
+    switch (enmShadowMode)
+    {
+        case PGMMODE_EPT:
+            return pVM->pgm.s.HCPhysShwNestedRoot;
+
+        default:
+            return pVM->pgm.s.HCPhysShwCR3;
+    }
 #else
     PGMMODE enmShadowMode = pVM->pgm.s.enmShadowMode;

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1498 +1498 @@
         if (pVM->hwaccm.s.fNestedPaging)
         {
-            AssertMsg(   PGMGetEPTCR3(pVM)
+            AssertMsg(   PGMGetEPTCR3(pVM) == PGMGetHyperCR3(pVM)
                       || VM_FF_ISPENDING(pVM, VM_FF_PGM_SYNC_CR3 | VM_FF_PGM_SYNC_CR3_NON_GLOBAL),
                       ("%RHp vs %RHp\n", PGMGetEPTCR3(pVM), PGMGetHyperCR3(pVM)));