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

Timestamp:

May 9, 2013 3:32:14 PM (12 years ago)

Author:

vboxsync

Message:

VMM: Facility for getting the highest-priority pending interrupt from the APIC device.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• VMMAll/PDMAll.cpp (modified) (3 diffs)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (2 diffs)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)
• include/PDMInternal.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -1532 +1532 @@
         {
             uint8_t u8Tpr;
-            int rc = PDMApicGetTPR(pVCpu, &u8Tpr, NULL /*pfPending*/);
+            int rc = PDMApicGetTPR(pVCpu, &u8Tpr, NULL /* pfPending */, NULL /* pu8PendingIrq */);
             if (RT_FAILURE(rc))
             {

trunk/src/VBox/VMM/VMMAll/PDMAll.cpp

@@ -279 +279 @@
         Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnSetTPR));
         pdmLock(pVM);
-        *pfPending = pVM->pdm.s.Apic.CTX_SUFF(pfnHasPendingIrq)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu->idCpu);
+        *pfPending = pVM->pdm.s.Apic.CTX_SUFF(pfnHasPendingIrq)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu->idCpu,
+                                                                NULL /* pu8PendingIrq */);
         pdmUnlock(pVM);
         return VINF_SUCCESS;
@@ -316 +317 @@
  * @param   pu8TPR          Where to store the TRP.
  * @param   pfPending       Pending interrupt state (out).
+ * @param   pu8PendingIrq   Where to store the highest-priority pending IRQ
+ *                          (optional, can be NULL) (out).
  *
  * @remarks No-long-jump zone!!!
  */
-VMMDECL(int) PDMApicGetTPR(PVMCPU pVCpu, uint8_t *pu8TPR, bool *pfPending)
+VMMDECL(int) PDMApicGetTPR(PVMCPU pVCpu, uint8_t *pu8TPR, bool *pfPending, uint8_t *pu8PendingIrq)
 {
     PVM pVM = pVCpu->CTX_SUFF(pVM);
@@ -332 +335 @@
         *pu8TPR = pVM->pdm.s.Apic.CTX_SUFF(pfnGetTPR)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu->idCpu);
         if (pfPending)
-            *pfPending = pVM->pdm.s.Apic.CTX_SUFF(pfnHasPendingIrq)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu->idCpu);
+        {
+            *pfPending = pVM->pdm.s.Apic.CTX_SUFF(pfnHasPendingIrq)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu->idCpu,
+                                                                    pu8PendingIrq);
+        }
         return VINF_SUCCESS;
     }

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

@@ -2487 +2487 @@
             bool    fPendingIntr = false;
             uint8_t u8GuestTpr   = 0;
-            rc = PDMApicGetTPR(pVCpu, &u8GuestTpr, &fPendingIntr);
+            rc = PDMApicGetTPR(pVCpu, &u8GuestTpr, &fPendingIntr, NULL /* pu8PendingIntr */);
             AssertRCReturn(rc, rc);
 

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

@@ -1402 +1402 @@
         /* TPR caching in CR8 */
         bool fPending;
-        rc2 = PDMApicGetTPR(pVCpu, &u8LastTPR, &fPending);
+        rc2 = PDMApicGetTPR(pVCpu, &u8LastTPR, &fPending, NULL /* pu8PendingIrq */);
         AssertRC(rc2);
 
@@ -2867 +2867 @@
             case HMTPRINSTR_READ:
                 /* TPR caching in CR8 */
-                rc = PDMApicGetTPR(pVCpu, &u8Tpr, &fPending);
+                rc = PDMApicGetTPR(pVCpu, &u8Tpr, &fPending, NULL /* pu8PendingIrq */);
                 AssertRC(rc);
 

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

@@ -3177 +3177 @@
         bool    fPending;
 
-        rc2 = PDMApicGetTPR(pVCpu, &u8LastTPR, &fPending);
+        rc2 = PDMApicGetTPR(pVCpu, &u8LastTPR, &fPending, NULL /* pu8PendingIrq */);
         AssertRC(rc2);
         /* The TPR can be found at offset 0x80 in the APIC mmio page. */

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -563 +563 @@
     DECLR3CALLBACKMEMBER(int,       pfnGetInterruptR3,(PPDMDEVINS pDevIns, VMCPUID idCpu, uint32_t *puTagSrc));
     /** @copydoc PDMAPICREG::pfnHasPendingIrqR3 */
-    DECLR3CALLBACKMEMBER(bool,      pfnHasPendingIrqR3,(PPDMDEVINS pDevIns, VMCPUID idCpu));
+    DECLR3CALLBACKMEMBER(bool,      pfnHasPendingIrqR3,(PPDMDEVINS pDevIns, VMCPUID idCpu, uint8_t *pu8PendingIrq));
     /** @copydoc PDMAPICREG::pfnSetBaseR3 */
     DECLR3CALLBACKMEMBER(void,      pfnSetBaseR3,(PPDMDEVINS pDevIns, VMCPUID idCpu, uint64_t u64Base));
@@ -587 +587 @@
     DECLR0CALLBACKMEMBER(int,       pfnGetInterruptR0,(PPDMDEVINS pDevIns, VMCPUID idCpu, uint32_t *puTagSrc));
     /** @copydoc PDMAPICREG::pfnHasPendingIrqR3 */
-    DECLR0CALLBACKMEMBER(bool,      pfnHasPendingIrqR0,(PPDMDEVINS pDevIns, VMCPUID idCpu));
+    DECLR0CALLBACKMEMBER(bool,      pfnHasPendingIrqR0,(PPDMDEVINS pDevIns, VMCPUID idCpu, uint8_t *pu8PendingIrq));
     /** @copydoc PDMAPICREG::pfnSetBaseR3 */
     DECLR0CALLBACKMEMBER(void,      pfnSetBaseR0,(PPDMDEVINS pDevIns, VMCPUID idCpu, uint64_t u64Base));
@@ -611 +611 @@
     DECLRCCALLBACKMEMBER(int,       pfnGetInterruptRC,(PPDMDEVINS pDevIns, VMCPUID idCpu, uint32_t *puTagSrc));
     /** @copydoc PDMAPICREG::pfnHasPendingIrqR3 */
-    DECLRCCALLBACKMEMBER(bool,      pfnHasPendingIrqRC,(PPDMDEVINS pDevIns, VMCPUID idCpu));
+    DECLRCCALLBACKMEMBER(bool,      pfnHasPendingIrqRC,(PPDMDEVINS pDevIns, VMCPUID idCpu, uint8_t *pu8PendingIrq));
     /** @copydoc PDMAPICREG::pfnSetBaseR3 */
     DECLRCCALLBACKMEMBER(void,      pfnSetBaseRC,(PPDMDEVINS pDevIns, VMCPUID idCpu, uint64_t u64Base));