Changeset 19996 in vbox

Timestamp:

May 25, 2009 12:39:02 PM (15 years ago)

Author:

vboxsync

Message:

Moved TPR caching check to the top.

File:

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

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

@@ -1997 +1997 @@
     RTGCUINTPTR errCode, instrInfo;
     bool        fSyncTPR = false;
+    bool        fSetupTPRCaching = false;
     PHWACCM_CPUINFO pCpu = 0;
     RTCCUINTREG uOldEFlags;
@@ -2007 +2008 @@
     bool fStatExit2Started = false;
 #endif
+
+    /* Check if we need to use TPR shadowing. */
+    if (    pVM->hwaccm.s.vmx.pAPIC
+        &&  (   CPUMIsGuestInLongModeEx(pCtx)
+             || (   (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_VIRT_APIC)
+                 && PDMHasIoApic(pVM))
+            )
+       )
+    {
+        fSetupTPRCaching = true;
+    }
 
     Log2(("\nE"));
@@ -2163 +2175 @@
      * @todo reduce overhead
      */
-    if (    PDMHasIoApic(pVM)
-        &&  pVM->hwaccm.s.vmx.pAPIC)
+    if (fSetupTPRCaching)
     {
         /* TPR caching in CR8 */