Changeset 13025 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 7, 2008 7:28:54 AM (16 years ago)

Author:

vboxsync

Message:

Updates for EPT.

File:

• trunk/src/VBox/VMM/VMMAll/HWACCMAll.cpp (modified) (3 diffs)

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

@@ -53 +53 @@
 VMMDECL(int) HWACCMInvalidatePage(PVM pVM, RTGCPTR GCVirt)
 {
-    /** @todo Intel for nested paging */
 #ifdef IN_RING0
-    if (pVM->hwaccm.s.svm.fSupported)
-        return SVMR0InvalidatePage(pVM, GCVirt);
+    if (pVM->hwaccm.s.vmx.fSupported)
+        return VMXR0InvalidatePage(pVM, GCVirt);
+
+    Assert(pVM->hwaccm.s.svm.fSupported);
+    return SVMR0InvalidatePage(pVM, GCVirt);
 #endif
 
@@ -70 +72 @@
 VMMDECL(int) HWACCMFlushTLB(PVM pVM)
 {
-    /** @todo Intel for nested paging */
-    if (pVM->hwaccm.s.svm.fSupported)
-    {
-        LogFlow(("HWACCMFlushTLB\n"));
-        pVM->hwaccm.s.svm.fForceTLBFlush = true;
-        STAM_COUNTER_INC(&pVM->hwaccm.s.StatFlushTLBManual);
-    }
+    LogFlow(("HWACCMFlushTLB\n"));
+
+    pVM->hwaccm.s.fForceTLBFlush = true;
+    STAM_COUNTER_INC(&pVM->hwaccm.s.StatFlushTLBManual);
     return VINF_SUCCESS;
 }
@@ -121 +120 @@
 
 #ifdef IN_RING0
-    /** @todo Intel for nested paging */
-    if (pVM->hwaccm.s.svm.fSupported)
-    {
-        SVMR0InvalidatePhysPage(pVM, GCPhys);
-    }
+    if (pVM->hwaccm.s.vmx.fSupported)
+        return VMXR0InvalidatePhysPage(pVM, GCPhys);
+
+    Assert(pVM->hwaccm.s.svm.fSupported);
+    SVMR0InvalidatePhysPage(pVM, GCPhys);
 #else
     HWACCMFlushTLB(pVM);