Changeset 24251 in vbox

Timestamp:

Nov 2, 2009 1:13:37 PM (15 years ago)

Author:

vboxsync

Message:

Another tpr patch fix

File:

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

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

@@ -2259 +2259 @@
     RTGCUINTPTR errCode, instrInfo;
     bool        fSetupTPRCaching = false;
-    bool        fRestoreLSTAR = false;
     uint64_t    u64LSTAR = 0;
     uint8_t     u8LastTPR = 0;
@@ -2503 +2502 @@
                 /* A TPR change could activate a pending interrupt, so catch lstar writes. */
                 vmxR0SetMSRPermission(pVCpu, MSR_K8_LSTAR, true, false);
-                fRestoreLSTAR = false;
             }
             else
@@ -2511 +2509 @@
                  */
                 vmxR0SetMSRPermission(pVCpu, MSR_K8_LSTAR, true, true);
-
-                /* Must save the host LSTAR msr to restore it later. */
-                fRestoreLSTAR = true;
             }
         }
@@ -2614 +2609 @@
 
     /* Save the current TPR value in the LSTAR msr so our patches can access it. */
-    if (fRestoreLSTAR)
+    if (pVM->hwaccm.s.fTPRPatchingActive)
     {
         Assert(pVM->hwaccm.s.fTPRPatchingActive);
@@ -2638 +2633 @@
 
     /* Restore the host LSTAR msr if the guest could have changed it. */
-    if (fRestoreLSTAR)
+    if (pVM->hwaccm.s.fTPRPatchingActive)
     {
         Assert(pVM->hwaccm.s.fTPRPatchingActive);