Changeset 13133 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Oct 9, 2008 1:41:43 PM (16 years ago)

Author:

vboxsync

Message:

Disabled VPID support by default; seems to work, but no compelling reason to activate it yet (testing matrix).

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (9 diffs)

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

@@ -342 +342 @@
         if (pVM->hwaccm.s.fNestedPaging)
             val |= VMX_VMCS_CTRL_PROC_EXEC2_EPT;
+#endif /* HWACCM_VTX_WITH_EPT */
+#ifdef HWACCM_VTX_WITH_VPID
         else
         if (pVM->hwaccm.s.vmx.fVPID)
             val |= VMX_VMCS_CTRL_PROC_EXEC2_VPID;
-#endif
+#endif /* HWACCM_VTX_WITH_VPID */
+
         /* Mask away the bits that the CPU doesn't support */
         /** @todo make sure they don't conflict with the above requirements. */
@@ -489 +492 @@
             pVM->hwaccm.s.vmx.enmFlushContext = VMX_FLUSH_SINGLE_CONTEXT;
     }
+#ifdef HWACCM_VTX_WITH_VPID
     else
     if (pVM->hwaccm.s.vmx.fVPID)
@@ -508 +512 @@
             pVM->hwaccm.s.vmx.enmFlushContext = VMX_FLUSH_SINGLE_CONTEXT;
     }
+#endif /* HWACCM_VTX_WITH_VPID */
     else
         pVM->hwaccm.s.vmx.pfnSetupTaggedTLB = VMXR0SetupTLBDummy;
@@ -1554 +1559 @@
 }
 
+#ifdef HWACCM_VTX_WITH_VPID
 /**
  * Setup the tagged TLB for VPID
@@ -1626 +1632 @@
 #endif
 }
+#endif /* HWACCM_VTX_WITH_VPID */
 
 /**
@@ -1803 +1810 @@
 #if defined(HWACCM_VTX_WITH_EPT) && defined(LOG_ENABLED)
     if (    pVM->hwaccm.s.fNestedPaging
-        ||  pVM->hwaccm.s.vmx.fVPID)
+# ifdef HWACCM_VTX_WITH_VPID
+        ||  pVM->hwaccm.s.vmx.fVPID
+# endif /* HWACCM_VTX_WITH_VPID */
+        )
     {
         pCpu = HWACCMR0GetCurrentCpu();
@@ -2984 +2994 @@
 }
 
+#ifdef HWACCM_VTX_WITH_VPID
 /**
  * Flush the TLB (EPT)
@@ -3002 +3013 @@
     AssertRC(rc);
 }
+#endif /* HWACCM_VTX_WITH_VPID */
 
 /**
@@ -3017 +3029 @@
     Assert(!pVM->hwaccm.s.fNestedPaging);
 
+#ifdef HWACCM_VTX_WITH_VPID
     /* Skip it if a TLB flush is already pending. */
     if (   !fFlushPending 
         && pVM->hwaccm.s.vmx.fVPID)
         VMXR0FlushVPID(pVM, pVM->hwaccm.s.vmx.enmFlushPage, GCVirt);
+#endif /* HWACCM_VTX_WITH_VPID */
 
     return VINF_SUCCESS;