Changeset 13105 in vbox

Timestamp:

Oct 9, 2008 8:19:19 AM (16 years ago)

Author:

vboxsync

Message:

Corrected physical address handling

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -298 +298 @@
 
         /** Current EPTP. */
-        RTGCPHYS                    GCPhysEPTP;
+        RTHCPHYS                    GCPhysEPTP;
 
         /** VMX MSR values */

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

@@ -1185 +1185 @@
         if (pVM->hwaccm.s.fNestedPaging)
         {
+            RTHCPHYS GCPhys;
+
             Assert(pVM->hwaccm.s.vmx.GCPhysEPTP == PGMGetHyperCR3(pVM));
-            val = pVM->hwaccm.s.vmx.GCPhysEPTP;
+            GCPhys = pVM->hwaccm.s.vmx.GCPhysEPTP;
 
             Assert(!(val & 0xfff));
             /** @todo Check the IA32_VMX_EPT_VPID_CAP MSR for other supported memory types. */
-            val |=   VMX_EPT_MEMTYPE_WB
-                  | (VMX_EPT_PAGE_WALK_LENGTH_DEFAULT << VMX_EPT_PAGE_WALK_LENGTH_SHIFT);
-            rc = VMXWriteVMCS(VMX_VMCS_CTRL_EPTP_FULL, val);
+            GCPhys |=   VMX_EPT_MEMTYPE_WB
+                     | (VMX_EPT_PAGE_WALK_LENGTH_DEFAULT << VMX_EPT_PAGE_WALK_LENGTH_SHIFT);
+            rc = VMXWriteVMCS(VMX_VMCS_CTRL_EPTP_FULL, GCPhys);
 #if HC_ARCH_BITS == 32
-            rc = VMXWriteVMCS(VMX_VMCS_CTRL_EPTP_HIGH, (uint32_t)(val >> 32ULL));
+            rc = VMXWriteVMCS(VMX_VMCS_CTRL_EPTP_HIGH, (uint32_t)(GCPhys >> 32ULL));
 #endif
             AssertRC(rc);