Changeset 24249 in vbox

Timestamp:

Nov 2, 2009 12:44:11 PM (15 years ago)

Author:

vboxsync

Message:

TPR patch fixes

File:

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

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

@@ -2514 +2514 @@
                 /* Must save the host LSTAR msr to restore it later. */
                 fRestoreLSTAR = true;
-                u64LSTAR = ASMRdMsr(MSR_K8_LSTAR);
             }
         }
@@ -2614 +2613 @@
 #endif
 
+    /* Save the current TPR value in the LSTAR msr so our patches can access it. */
+    if (fRestoreLSTAR)
+    {
+        Assert(pVM->hwaccm.s.fTPRPatchingActive);
+        u64LSTAR = ASMRdMsr(MSR_K8_LSTAR);
+        ASMWrMsr(MSR_K8_LSTAR, u8LastTPR);
+    }
+
     TMNotifyStartOfExecution(pVCpu);
 #ifdef VBOX_WITH_KERNEL_USING_XMM
@@ -2634 +2641 @@
     {
         Assert(pVM->hwaccm.s.fTPRPatchingActive);
+        pCtx->msrLSTAR = ASMRdMsr(MSR_K8_LSTAR);
         ASMWrMsr(MSR_K8_LSTAR, u64LSTAR);
     }