Changeset 15040 in vbox for trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

Timestamp:

Dec 5, 2008 1:19:35 PM (16 years ago)

Author:

vboxsync

Message:

Always set the tpr shadow feature; host mode is irrelevant

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (1 diff)

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

@@ -329 +329 @@
 
         /* Note: VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_MWAIT_EXIT might cause a vmlaunch failure with an invalid control fields error. (combined with some other exit reasons) */
-
-#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
-        if (VMX_IS_64BIT_HOST_MODE())
-        {
-            if (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_USE_TPR_SHADOW)
-            {
-                /* CR8 reads from the APIC shadow page; writes cause an exit is they lower the TPR below the threshold */
-                val |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_USE_TPR_SHADOW;
-                Assert(pVM->hwaccm.s.vmx.pAPIC);
-            }
-            else
-                /* Exit on CR8 reads & writes in case the TPR shadow feature isn't present. */
-                val |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR8_STORE_EXIT | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR8_LOAD_EXIT;
-        }
-#endif
+        if (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_USE_TPR_SHADOW)
+        {
+            /* CR8 reads from the APIC shadow page; writes cause an exit is they lower the TPR below the threshold */
+            val |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_USE_TPR_SHADOW;
+            Assert(pVM->hwaccm.s.vmx.pAPIC);
+        }
+        else
+            /* Exit on CR8 reads & writes in case the TPR shadow feature isn't present. */
+            val |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR8_STORE_EXIT | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR8_LOAD_EXIT;
 
 #ifdef VBOX_WITH_VTX_MSR_BITMAPS