Changeset 21988 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 5, 2009 12:16:49 PM (15 years ago)

Author:

vboxsync

Message:

Updates

File:

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

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

@@ -1629 +1629 @@
                 &&  CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx)) == 0
                 &&  !CPUMIsGuestInLongModeEx(pCtx)
-                &&  pVM->hwaccm.s.svm.cPatches < RT_ELEMENTS(pVM->hwaccm.s.svm.aPatches)
+                &&  pVM->hwaccm.s.svm.cPatches < RT_ELEMENTS(pVM->hwaccm.s.svm.aPatches))
             {
                 RTGCPHYS GCPhysApicBase, GCPhys;
@@ -1797 +1797 @@
             &&  CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx)) == 0
             &&  !CPUMIsGuestInLongModeEx(pCtx)
-            &&  pVM->hwaccm.s.svm.cPatches < RT_ELEMENTS(pVM->hwaccm.s.svm.aPatches)
+            &&  pVM->hwaccm.s.svm.cPatches < RT_ELEMENTS(pVM->hwaccm.s.svm.aPatches))
         {
             RTGCPHYS GCPhysApicBase;
@@ -2356 +2356 @@
         if (    pVM->hwaccm.s.svm.fTPRPatchingActive
             &&  pCtx->ecx == MSR_K8_LSTAR
-            &&  pVMCB->ctrl.u64ExitInfo1 == 1 /* wrmsr */
-            &&  (pCtx->eax & 0xff) != u8LastTPR)
-        {
-            Log(("SVM: Faulting MSR_K8_LSTAR write with new TPR value %x\n", pCtx->eax & 0xff));
-
-            /* Our patch code uses LSTAR for TPR caching. */
-            rc = PDMApicSetTPR(pVCpu, pCtx->eax & 0xff);
-            AssertRC(rc);
+            &&  pVMCB->ctrl.u64ExitInfo1 == 1 /* wrmsr */)
+        {
+            if ((pCtx->eax & 0xff) != u8LastTPR)
+            {
+                Log(("SVM: Faulting MSR_K8_LSTAR write with new TPR value %x\n", pCtx->eax & 0xff));
+
+                /* Our patch code uses LSTAR for TPR caching. */
+                rc = PDMApicSetTPR(pVCpu, pCtx->eax & 0xff);
+                AssertRC(rc);
+            }
 
             /* Skip the instruction and continue. */