Changeset 46829 in vbox

Timestamp:

Jun 27, 2013 11:49:45 AM (12 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Fix while resyncing the TPR. Vista 64 now boots.

File:

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

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

@@ -2156 +2156 @@
         pVmcb->ctrl.u64VmcbCleanBits &= ~(HMSVM_VMCB_CLEAN_INTERCEPTS | HMSVM_VMCB_CLEAN_TPR);
 
-        Log4(("Setting virtual interrupt pending intercept\n"));
+        Log4(("Setting VINTR intercept\n"));
     }
 }
@@ -2197 +2197 @@
         if (fInject)
         {
+            Log4(("TPR=%#x\n", pVmcb->ctrl.IntCtrl.n.u8VTPR));
+            hmR0SvmInjectEventVmcb(pVCpu, pVmcb, pCtx, &Event);
             pVCpu->hm.s.Event.fPending = false;
-            hmR0SvmInjectEventVmcb(pVCpu, pVmcb, pCtx, &Event);
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatIntReinject);
         }
         else
@@ -2720 +2722 @@
                 AssertRC(rc);
             }
-            else if ((uint8_t)(pSvmTransient->u8GuestTpr >> 4) != pVmcb->ctrl.IntCtrl.n.u8VTPR)
+            else if (pSvmTransient->u8GuestTpr != pVmcb->ctrl.IntCtrl.n.u8VTPR)
             {
                 int rc = PDMApicSetTPR(pVCpu, pVmcb->ctrl.IntCtrl.n.u8VTPR << 4);