Changeset 10492 in vbox for trunk/src/VBox

Timestamp:

Jul 11, 2008 8:14:13 AM (16 years ago)

Author:

vboxsync

Message:

Added PDMApicHasPendingIrq.

Location:

trunk/src/VBox

Files:

• Devices/PC/DevAPIC.cpp (modified) (6 diffs)
• VMM/PDMDevice.cpp (modified) (13 diffs)
• VMM/PDMInternal.h (modified) (3 diffs)
• VMM/VMMAll/PDMAll.cpp (modified) (1 diff)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -267 +267 @@
 PDMBOTHCBDECL(int)  apicMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb);
 PDMBOTHCBDECL(int)  apicGetInterrupt(PPDMDEVINS pDevIns);
+PDMBOTHCBDECL(bool) apicHasPendingIrq(PPDMDEVINS pDevIns);
 PDMBOTHCBDECL(void) apicSetBase(PPDMDEVINS pDevIns, uint64_t val);
 PDMBOTHCBDECL(uint64_t) apicGetBase(PPDMDEVINS pDevIns);
@@ -761 +762 @@
     return intno;
 }
+
+/* Check if the APIC has a pending interrupt/if a TPR change would active one. */
+PDMBOTHCBDECL(bool) apicHasPendingIrq(PPDMDEVINS pDevIns)
+{
+    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    return false;
+}
+
 
 static uint32_t apic_get_current_count(APICState *s)
@@ -1680 +1689 @@
      * Register the APIC.
      */
-    ApicReg.u32Version          = PDM_APICREG_VERSION;
-    ApicReg.pfnGetInterruptHC   = apicGetInterrupt;
-    ApicReg.pfnSetBaseHC        = apicSetBase;
-    ApicReg.pfnGetBaseHC        = apicGetBase;
-    ApicReg.pfnSetTPRHC         = apicSetTPR;
-    ApicReg.pfnGetTPRHC         = apicGetTPR;
-    ApicReg.pfnBusDeliverHC     = apicBusDeliverCallback;
+    ApicReg.u32Version              = PDM_APICREG_VERSION;
+    ApicReg.pfnGetInterruptHC       = apicGetInterrupt;
+    ApicReg.pfnHasPendingIrqHC      = apicHasPendingIrq;
+    ApicReg.pfnSetBaseHC            = apicSetBase;
+    ApicReg.pfnGetBaseHC            = apicGetBase;
+    ApicReg.pfnSetTPRHC             = apicSetTPR;
+    ApicReg.pfnGetTPRHC             = apicGetTPR;
+    ApicReg.pfnBusDeliverHC         = apicBusDeliverCallback;
     if (fGCEnabled) {
         ApicReg.pszGetInterruptGC   = "apicGetInterrupt";
+        ApicReg.pszHasPendingIrqGC  = "apicHasPendingIrq";
         ApicReg.pszSetBaseGC        = "apicSetBase";
         ApicReg.pszGetBaseGC        = "apicGetBase";
@@ -1696 +1707 @@
     } else {
         ApicReg.pszGetInterruptGC   = NULL;
+        ApicReg.pszHasPendingIrqGC  = NULL;
         ApicReg.pszSetBaseGC        = NULL;
         ApicReg.pszGetBaseGC        = NULL;
@@ -1704 +1716 @@
     if (fR0Enabled) {
         ApicReg.pszGetInterruptR0   = "apicGetInterrupt";
+        ApicReg.pszHasPendingIrqR0  = "apicHasPendingIrq";
         ApicReg.pszSetBaseR0        = "apicSetBase";
         ApicReg.pszGetBaseR0        = "apicGetBase";
@@ -1711 +1724 @@
     } else {
         ApicReg.pszGetInterruptR0   = NULL;
+        ApicReg.pszHasPendingIrqR0  = NULL;
         ApicReg.pszSetBaseR0        = NULL;
         ApicReg.pszGetBaseR0        = NULL;

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -2645 +2645 @@
     }
     if (    !pApicReg->pfnGetInterruptHC
+        ||  !pApicReg->pfnHasPendingIrqHC
         ||  !pApicReg->pfnSetBaseHC
         ||  !pApicReg->pfnGetBaseHC
@@ -2652 +2653 @@
     {
         Assert(pApicReg->pfnGetInterruptHC);
+        Assert(pApicReg->pfnHasPendingIrqHC);
         Assert(pApicReg->pfnSetBaseHC);
         Assert(pApicReg->pfnGetBaseHC);
@@ -2661 +2663 @@
     }
     if (   (    pApicReg->pszGetInterruptGC
+            ||  pApicReg->pszHasPendingIrqGC
             ||  pApicReg->pszSetBaseGC
             ||  pApicReg->pszGetBaseGC
@@ -2667 +2670 @@
             ||  pApicReg->pszBusDeliverGC)
         &&  (   !VALID_PTR(pApicReg->pszGetInterruptGC)
+            ||  !VALID_PTR(pApicReg->pszHasPendingIrqGC)
             ||  !VALID_PTR(pApicReg->pszSetBaseGC)
             ||  !VALID_PTR(pApicReg->pszGetBaseGC)
@@ -2675 +2679 @@
     {
         Assert(VALID_PTR(pApicReg->pszGetInterruptGC));
+        Assert(VALID_PTR(pApicReg->pszHasPendingIrqGC));
         Assert(VALID_PTR(pApicReg->pszSetBaseGC));
         Assert(VALID_PTR(pApicReg->pszGetBaseGC));
@@ -2684 +2689 @@
     }
     if (   (    pApicReg->pszGetInterruptR0
+            ||  pApicReg->pszHasPendingIrqR0
             ||  pApicReg->pszSetBaseR0
             ||  pApicReg->pszGetBaseR0
@@ -2690 +2696 @@
             ||  pApicReg->pszBusDeliverR0)
         &&  (   !VALID_PTR(pApicReg->pszGetInterruptR0)
+            ||  !VALID_PTR(pApicReg->pszHasPendingIrqR0)
             ||  !VALID_PTR(pApicReg->pszSetBaseR0)
             ||  !VALID_PTR(pApicReg->pszGetBaseR0)
@@ -2698 +2705 @@
     {
         Assert(VALID_PTR(pApicReg->pszGetInterruptR0));
+        Assert(VALID_PTR(pApicReg->pszHasPendingIrqR0));
         Assert(VALID_PTR(pApicReg->pszSetBaseR0));
         Assert(VALID_PTR(pApicReg->pszGetBaseR0));
@@ -2733 +2741 @@
         if (RT_SUCCESS(rc))
         {
+            rc = PDMR3GetSymbolGCLazy(pVM, pDevIns->pDevReg->szGCMod, pApicReg->pszHasPendingIrqGC, &pVM->pdm.s.Apic.pfnHasPendingIrqGC);
+            AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szGCMod, pApicReg->pszHasPendingIrqGC, rc));
+        }
+        if (RT_SUCCESS(rc))
+        {
             rc = PDMR3GetSymbolGCLazy(pVM, pDevIns->pDevReg->szGCMod, pApicReg->pszSetBaseGC, &pVM->pdm.s.Apic.pfnSetBaseGC);
             AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szGCMod, pApicReg->pszSetBaseGC, rc));
@@ -2767 +2780 @@
         pVM->pdm.s.Apic.pDevInsGC           = 0;
         pVM->pdm.s.Apic.pfnGetInterruptGC   = 0;
+        pVM->pdm.s.Apic.pfnHasPendingIrqGC  = 0;
         pVM->pdm.s.Apic.pfnSetBaseGC        = 0;
         pVM->pdm.s.Apic.pfnGetBaseGC        = 0;
@@ -2783 +2797 @@
         if (RT_SUCCESS(rc))
         {
+            rc = PDMR3GetSymbolR0Lazy(pVM, pDevIns->pDevReg->szR0Mod, pApicReg->pszHasPendingIrqR0, &pVM->pdm.s.Apic.pfnHasPendingIrqR0);
+            AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pApicReg->pszHasPendingIrqR0, rc));
+        }
+        if (RT_SUCCESS(rc))
+        {
             rc = PDMR3GetSymbolR0Lazy(pVM, pDevIns->pDevReg->szR0Mod, pApicReg->pszSetBaseR0, &pVM->pdm.s.Apic.pfnSetBaseR0);
             AssertMsgRC(rc, ("%s::%s rc=%Vrc\n", pDevIns->pDevReg->szR0Mod, pApicReg->pszSetBaseR0, rc));
@@ -2817 +2836 @@
     {
         pVM->pdm.s.Apic.pfnGetInterruptR0   = 0;
+        pVM->pdm.s.Apic.pfnHasPendingIrqR0  = 0;
         pVM->pdm.s.Apic.pfnSetBaseR0        = 0;
         pVM->pdm.s.Apic.pfnGetBaseR0        = 0;
@@ -2830 +2850 @@
     pVM->pdm.s.Apic.pDevInsR3           = pDevIns;
     pVM->pdm.s.Apic.pfnGetInterruptR3   = pApicReg->pfnGetInterruptHC;
+    pVM->pdm.s.Apic.pfnHasPendingIrqR3  = pApicReg->pfnHasPendingIrqHC;
     pVM->pdm.s.Apic.pfnSetBaseR3        = pApicReg->pfnSetBaseHC;
     pVM->pdm.s.Apic.pfnGetBaseR3        = pApicReg->pfnGetBaseHC;

trunk/src/VBox/VMM/PDMInternal.h

@@ -388 +388 @@
     /** @copydoc PDMAPICREG::pfnGetInterruptHC */
     DECLR3CALLBACKMEMBER(int,       pfnGetInterruptR3,(PPDMDEVINS pDevIns));
+    /** @copydoc PDMAPICREG::pfnHasPendingIrqHC */
+    DECLR3CALLBACKMEMBER(bool, pfnHasPendingIrqR3,(PPDMDEVINS pDevIns));
     /** @copydoc PDMAPICREG::pfnSetBaseHC */
     DECLR3CALLBACKMEMBER(void,      pfnSetBaseR3,(PPDMDEVINS pDevIns, uint64_t u64Base));
@@ -404 +406 @@
     /** @copydoc PDMAPICREG::pfnGetInterruptHC */
     DECLR0CALLBACKMEMBER(int,       pfnGetInterruptR0,(PPDMDEVINS pDevIns));
+    /** @copydoc PDMAPICREG::pfnHasPendingIrqHC */
+    DECLR0CALLBACKMEMBER(bool, pfnHasPendingIrqR0,(PPDMDEVINS pDevIns));
     /** @copydoc PDMAPICREG::pfnSetBaseHC */
     DECLR0CALLBACKMEMBER(void,      pfnSetBaseR0,(PPDMDEVINS pDevIns, uint64_t u64Base));
@@ -420 +424 @@
     /** @copydoc PDMAPICREG::pfnGetInterruptHC */
     DECLGCCALLBACKMEMBER(int,       pfnGetInterruptGC,(PPDMDEVINS pDevIns));
+    /** @copydoc PDMAPICREG::pfnHasPendingIrqHC */
+    DECLGCCALLBACKMEMBER(bool, pfnHasPendingIrqGC,(PPDMDEVINS pDevIns));
     /** @copydoc PDMAPICREG::pfnSetBaseHC */
     DECLGCCALLBACKMEMBER(void,      pfnSetBaseGC,(PPDMDEVINS pDevIns, uint64_t u64Base));

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

@@ -188 +188 @@
 
 /**
+ * Check if the APIC has a pending interrupt/if a TPR change would active one
+ *
+ * @returns Pending interrupt yes/no
+ * @param   pDevIns         Device instance of the APIC.
+ * @param   pfPending       Pending state (out)
+ */
+PDMDECL(int) PDMApicHasPendingIrq(PVM pVM, bool *pfPending)
+{
+    if (pVM->pdm.s.Apic.CTXALLSUFF(pDevIns))
+    {
+        Assert(pVM->pdm.s.Apic.CTXALLSUFF(pfnSetTPR));
+        pdmLock(pVM);
+        *pfPending = pVM->pdm.s.Apic.CTXALLSUFF(pfnHasPendingIrq)(pVM->pdm.s.Apic.CTXALLSUFF(pDevIns));
+        pdmUnlock(pVM);
+        return VINF_SUCCESS;
+    }
+    return VERR_PDM_NO_APIC_INSTANCE;
+}
+
+/**
  * Set the TPR (task priority register?).
  *