Changeset 81948 in vbox

Timestamp:

Nov 18, 2019 4:28:43 PM (5 years ago)

Author:

vboxsync

Message:

IOAPIC,VMM: Made the pfnSetEoi and PDMIoApicBroadcastEoi functions return VBOXSTRICTRC. bugref:9218

Location:

trunk

Files:

• include/VBox/vmm/pdmapi.h (modified) (1 diff)
• include/VBox/vmm/pdmdev.h (modified) (2 diffs)
• src/VBox/Devices/PC/DevIoApic.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMAll/APICAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PDMAll.cpp (modified) (1 diff)
• src/VBox/VMM/include/PDMInternal.h (modified) (3 diffs)

trunk/include/VBox/vmm/pdmapi.h

@@ -54 +54 @@
 VMM_INT_DECL(bool)      PDMHasApic(PVM pVM);
 VMM_INT_DECL(int)       PDMIoApicSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level, uint32_t uTagSrc);
-VMM_INT_DECL(int)       PDMIoApicBroadcastEoi(PVM pVM, uint8_t uVector);
+VMM_INT_DECL(VBOXSTRICTRC) PDMIoApicBroadcastEoi(PVM pVM, uint8_t uVector);
 VMM_INT_DECL(int)       PDMIoApicSendMsi(PVM pVM, RTGCPHYS GCAddr, uint32_t uValue, uint32_t uTagSrc);
 VMM_INT_DECL(int)       PDMVmmDevHeapR3ToGCPhys(PVM pVM, RTR3PTR pv, RTGCPHYS *pGCPhys);

trunk/include/VBox/vmm/pdmdev.h

@@ -1473 +1473 @@
      *
      * @returns Strict VBox status code - only the following informational status codes:
-     * @retval  VINF_IOM_R3_MMIO_WRITE if the I/O APIC lock is contenteded and we're in R0 or RC.2
+     * @retval  VINF_IOM_R3_MMIO_WRITE if the I/O APIC lock is contenteded and we're in R0 or RC.
      * @retval  VINF_SUCCESS
      *
@@ -1482 +1482 @@
      *          Actually, as per 2018-07-21 this isn't true (bird).
      */
-    DECLCALLBACKMEMBER(int, pfnSetEoi)(PPDMDEVINS pDevIns, uint8_t u8Vector);
+    DECLCALLBACKMEMBER(VBOXSTRICTRC, pfnSetEoi)(PPDMDEVINS pDevIns, uint8_t u8Vector);
 
     /** Just a safety precaution. */

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

@@ -630 +630 @@
 
 /**
- * @interface_method_impl{PDMIOAPICREG,pfnSetEoiR3}
- */
-static DECLCALLBACK(int) ioapicSetEoi(PPDMDEVINS pDevIns, uint8_t u8Vector)
+ * @interface_method_impl{PDMIOAPICREG,pfnSetEoi}
+ */
+static DECLCALLBACK(VBOXSTRICTRC) ioapicSetEoi(PPDMDEVINS pDevIns, uint8_t u8Vector)
 {
     PIOAPIC   pThis   = PDMDEVINS_2_DATA(pDevIns, PIOAPIC);
@@ -640 +640 @@
 
     bool fRemoteIrrCleared = false;
-    int rc = IOAPIC_LOCK(pDevIns, pThis, pThisCC, VINF_IOM_R3_MMIO_WRITE);
+    VBOXSTRICTRC rc = IOAPIC_LOCK(pDevIns, pThis, pThisCC, VINF_IOM_R3_MMIO_WRITE);
     if (rc == VINF_SUCCESS)
     {
@@ -677 +677 @@
 
 /**
- * @interface_method_impl{PDMIOAPICREG,pfnSetIrqR3}
+ * @interface_method_impl{PDMIOAPICREG,pfnSetIrq}
  */
 static DECLCALLBACK(void) ioapicSetIrq(PPDMDEVINS pDevIns, int iIrq, int iLevel, uint32_t uTagSrc)
@@ -773 +773 @@
 
 /**
- * @interface_method_impl{PDMIOAPICREG,pfnSendMsiR3}
+ * @interface_method_impl{PDMIOAPICREG,pfnSendMsi}
  */
 static DECLCALLBACK(void) ioapicSendMsi(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, uint32_t uValue, uint32_t uTagSrc)

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

@@ -1256 +1256 @@
         if (fLevelTriggered)
         {
-            int rc = PDMIoApicBroadcastEoi(pVCpu->CTX_SUFF(pVM), uVector);
+            VBOXSTRICTRC rc = PDMIoApicBroadcastEoi(pVCpu->CTX_SUFF(pVM), uVector);
             if (rc == VINF_SUCCESS)
             { /* likely */ }

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

@@ -196 +196 @@
  * @param   uVector         The interrupt vector corresponding to the EOI.
  */
-VMM_INT_DECL(int) PDMIoApicBroadcastEoi(PVM pVM, uint8_t uVector)
+VMM_INT_DECL(VBOXSTRICTRC) PDMIoApicBroadcastEoi(PVM pVM, uint8_t uVector)
 {
     /* At present, we support only a maximum of one I/O APIC per-VM. If we ever implement having

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

@@ -673 +673 @@
     DECLR3CALLBACKMEMBER(void,      pfnSendMsiR3,(PPDMDEVINS pDevIns, RTGCPHYS GCAddr, uint32_t uValue, uint32_t uTagSrc));
     /** @copydoc PDMIOAPICREG::pfnSetEoiR3 */
-    DECLR3CALLBACKMEMBER(int,       pfnSetEoiR3,(PPDMDEVINS pDevIns, uint8_t u8Vector));
+    DECLR3CALLBACKMEMBER(VBOXSTRICTRC, pfnSetEoiR3,(PPDMDEVINS pDevIns, uint8_t u8Vector));
 
     /** Pointer to the PIC device instance - R0. */
@@ -682 +682 @@
     DECLR0CALLBACKMEMBER(void,      pfnSendMsiR0,(PPDMDEVINS pDevIns, RTGCPHYS GCAddr, uint32_t uValue, uint32_t uTagSrc));
     /** @copydoc PDMIOAPICREG::pfnSetEoiR3 */
-    DECLR0CALLBACKMEMBER(int,       pfnSetEoiR0,(PPDMDEVINS pDevIns, uint8_t u8Vector));
+    DECLR0CALLBACKMEMBER(VBOXSTRICTRC, pfnSetEoiR0,(PPDMDEVINS pDevIns, uint8_t u8Vector));
 
     /** Pointer to the APIC device instance - RC Ptr. */
@@ -691 +691 @@
     DECLRCCALLBACKMEMBER(void,      pfnSendMsiRC,(PPDMDEVINS pDevIns, RTGCPHYS GCAddr, uint32_t uValue, uint32_t uTagSrc));
      /** @copydoc PDMIOAPICREG::pfnSendMsiR3 */
-    DECLRCCALLBACKMEMBER(int,       pfnSetEoiRC,(PPDMDEVINS pDevIns, uint8_t u8Vector));
+    DECLRCCALLBACKMEMBER(VBOXSTRICTRC, pfnSetEoiRC,(PPDMDEVINS pDevIns, uint8_t u8Vector));
 } PDMIOAPIC;