Changeset 24283 in vbox for trunk/src/VBox

Timestamp:

Nov 3, 2009 10:45:09 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

54264

Message:

Cleaned up

File:

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

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

@@ -2259 +2259 @@
     RTGCUINTPTR errCode, instrInfo;
     bool        fSetupTPRCaching = false;
-    uint64_t    u64LSTAR = 0;
+    uint64_t    u64OldLSTAR = 0;
     uint8_t     u8LastTPR = 0;
     RTCCUINTREG uOldEFlags = ~(RTCCUINTREG)0;
@@ -2612 +2612 @@
     {
         Assert(pVM->hwaccm.s.fTPRPatchingActive);
-        u64LSTAR = ASMRdMsr(MSR_K8_LSTAR);
+        u64OldLSTAR = ASMRdMsr(MSR_K8_LSTAR);
         ASMWrMsr(MSR_K8_LSTAR, u8LastTPR);
     }
@@ -2636 +2636 @@
     {
         Assert(pVM->hwaccm.s.fTPRPatchingActive);
-        pCtx->msrLSTAR = ASMRdMsr(MSR_K8_LSTAR);
-        ASMWrMsr(MSR_K8_LSTAR, u64LSTAR);
+        pVCpu->hwaccm.s.vmx.pVAPIC[0x80] = pCtx->msrLSTAR = ASMRdMsr(MSR_K8_LSTAR);
+        ASMWrMsr(MSR_K8_LSTAR, u64OldLSTAR);
     }
 
@@ -2736 +2736 @@
 
     /* Sync back the TPR if it was changed. */
-    if (fSetupTPRCaching)
-    {
-        if (pVM->hwaccm.s.fTPRPatchingActive)
-        {
-            if ((pCtx->msrLSTAR & 0xff) != u8LastTPR)
-            {
-                /* Our patch code uses LSTAR for TPR caching. */
-                rc = PDMApicSetTPR(pVCpu, pCtx->msrLSTAR & 0xff);
-                AssertRC(rc);
-            }
-        }
-        else
-        if (u8LastTPR != pVCpu->hwaccm.s.vmx.pVAPIC[0x80])
-        {
-            rc = PDMApicSetTPR(pVCpu, pVCpu->hwaccm.s.vmx.pVAPIC[0x80]);
-            AssertRC(rc);
-        }
+    if (    fSetupTPRCaching
+        &&  u8LastTPR != pVCpu->hwaccm.s.vmx.pVAPIC[0x80]
+    {
+        rc = PDMApicSetTPR(pVCpu, pVCpu->hwaccm.s.vmx.pVAPIC[0x80]);
+        AssertRC(rc);
     }