Changeset 10667 in vbox

Timestamp:

Jul 15, 2008 2:52:51 PM (17 years ago)

Author:

vboxsync

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

33379

Message:

Sync back TPR if necessary.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (3 diffs)
• HWVMXR0.cpp (modified) (3 diffs)

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

@@ -778 +778 @@
     SVM_VMCB   *pVMCB;
     bool        fGuestStateSynced = false;
+    bool        fSyncTPR = false;
     unsigned    cResume = 0;
     uint8_t     u8LastVTPR;
@@ -878 +879 @@
              */
             pVMCB->ctrl.u16InterceptWrCRx &= ~RT_BIT(8);
+
+        fSyncTPR = !fPending;
     }
 
@@ -1210 +1213 @@
         STAM_COUNTER_INC(&pVM->hwaccm.s.pStatExitReasonR0[exitCode & MASK_EXITREASON_STAT]);
 #endif
+
+    if (fSyncTPR)
+    {
+        rc = PDMApicSetTPR(pVM, pVMCB->ctrl.IntCtrl.n.u8VTPR);
+        AssertRC(rc);
+    }
 
     /* Deal with the reason of the VM-exit. */

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

@@ -1036 +1036 @@
     RTGCUINTPTR errCode, instrInfo, uInterruptState;
     bool        fGuestStateSynced = false;
+    bool        fSyncTPR = false;
     unsigned    cResume = 0;
 #ifdef VBOX_STRICT
@@ -1197 +1198 @@
         rc  = VMXWriteVMCS(VMX_VMCS_CTRL_TPR_THRESHOLD, (fPending) ? u8TPR : 0);
         AssertRC(rc);
+
+        fSyncTPR = !fPending;
     }
 
@@ -1527 +1530 @@
     Log2(("IntInfo = %08x\n", intInfo));
     Log2(("New EIP=%VGv\n", pCtx->rip));
+
+    if (fSyncTPR)
+    {
+        rc = PDMApicSetTPR(pVM, pVM->hwaccm.s.vmx.pAPIC[0x80]);
+        AssertRC(rc);
+    }
 
     /* Some cases don't need a complete resync of the guest CPU state; handle them here. */