Changeset 13113 in vbox for trunk/src

Timestamp:

Oct 9, 2008 9:28:09 AM (16 years ago)

Author:

vboxsync

Message:

Added PGMGetEPTCR3.

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -296 +296 @@
         /** Current CR4 mask. */
         uint64_t                    cr4_mask;
-
-        /** Current EPTP. */
-        RTHCPHYS                    GCPhysEPTP;
 
         /** VMX MSR values */

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

@@ -1265 +1265 @@
 }
 
+/**
+ * Gets the current CR3 register value for the EPT paging memory context.
+ * @returns CR3 value.
+ * @param   pVM         The VM handle.
+ */
+VMMDECL(RTHCPHYS) PGMGetEPTCR3(PVM pVM)
+{
+    return pVM->pgm.s.HCPhysNestedRoot;
+}
 
 /**

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

@@ -474 +474 @@
     {
         pVM->hwaccm.s.vmx.pfnSetupTaggedTLB = VMXR0SetupTLBEPT;
-        pVM->hwaccm.s.vmx.GCPhysEPTP = PGMGetHyperCR3(pVM);
 
         /* Default values for flushing. */
@@ -1190 +1189 @@
             RTHCPHYS GCPhys;
 
-            AssertMsg(pVM->hwaccm.s.vmx.GCPhysEPTP == PGMGetHyperCR3(pVM), ("%VHp vs %VHp\n", pVM->hwaccm.s.vmx.GCPhysEPTP, PGMGetHyperCR3(pVM)));
-            GCPhys = pVM->hwaccm.s.vmx.GCPhysEPTP;
+            AssertMsg(PGMGetEPTCR3(pVM) == PGMGetHyperCR3(pVM), ("%VHp vs %VHp\n", PGMGetEPTCR3(pVM), PGMGetHyperCR3(pVM)));
+            GCPhys = PGMGetEPTCR3(pVM);
 
             Assert(!(GCPhys & 0xfff));
@@ -2950 +2949 @@
 
     Assert(pVM->hwaccm.s.fNestedPaging);
-    descriptor[0] = pVM->hwaccm.s.vmx.GCPhysEPTP;
+    descriptor[0] = PGMGetEPTCR3(pVM);
     descriptor[1] = GCPhys;
     int rc = VMXR0InvEPT(enmFlush, &descriptor[0]);