Changeset 87477 in vbox for trunk/include/VBox

Timestamp:

Jan 29, 2021 11:43:09 AM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 PDM IOMMU code de-duplication and cleanup.

Location:

trunk/include/VBox

Files:

• err.h (modified) (1 diff)
• vmm/pdmdev.h (modified) (8 diffs)

trunk/include/VBox/err.h

@@ -3053 +3053 @@
 /** Command hardware failure. */
 #define VERR_IOMMU_CMD_HW_ERROR                     (-7213)
+/** IOMMU device is not present. */
+#define VERR_IOMMU_NOT_PRESENT                      (-7214)
 /** @} */
 

trunk/include/VBox/vmm/pdmdev.h

@@ -1320 +1320 @@
      * @returns VBox status code.
      * @param   pDevIns     The IOMMU device instance.
-     * @param   uDevId      The device identifier (bus, device, function).
+     * @param   uDeviceId   The device identifier (bus, device, function).
      * @param   pMsiIn      The source MSI.
      * @param   pMsiOut     Where to store the remapped MSI.
@@ -1326 +1326 @@
      * @thread  Any.
      */
-    DECLR0CALLBACKMEMBER(int, pfnMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDevId, PCMSIMSG pMsiIn, PMSIMSG pMsiOut));
+    DECLR0CALLBACKMEMBER(int, pfnMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDeviceId, PCMSIMSG pMsiIn, PMSIMSG pMsiOut));
 
     /** Just a safety precaution. */
@@ -1390 +1390 @@
      * @returns VBox status code.
      * @param   pDevIns     The IOMMU device instance.
-     * @param   uDevId      The device identifier (bus, device, function).
+     * @param   uDeviceId   The device identifier (bus, device, function).
      * @param   pMsiIn      The source MSI.
      * @param   pMsiOut     Where to store the remapped MSI.
@@ -1396 +1396 @@
      * @thread  Any.
      */
-    DECLRCCALLBACKMEMBER(int, pfnMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDevId, PCMSIMSG pMsiIn, PMSIMSG pMsiOut));
+    DECLRCCALLBACKMEMBER(int, pfnMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDeviceId, PCMSIMSG pMsiIn, PMSIMSG pMsiOut));
 
     /** Just a safety precaution. */
@@ -1460 +1460 @@
      * @returns VBox status code.
      * @param   pDevIns     The IOMMU device instance.
-     * @param   uDevId      The device identifier (bus, device, function).
+     * @param   uDeviceId   The device identifier (bus, device, function).
      * @param   pMsiIn      The source MSI.
      * @param   pMsiOut     Where to store the remapped MSI.
@@ -1466 +1466 @@
      * @thread  Any.
      */
-    DECLR3CALLBACKMEMBER(int, pfnMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDevId, PCMSIMSG pMsiIn, PMSIMSG pMsiOut));
+    DECLR3CALLBACKMEMBER(int, pfnMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDeviceId, PCMSIMSG pMsiIn, PMSIMSG pMsiOut));
 
     /** Just a safety precaution. */
@@ -1834 +1834 @@
      * @returns status code.
      * @param   pDevIns     Device instance of the IOAPIC.
-     * @param   uDevId      The device ID (bus, device, function) for the source MSI.
+     * @param   uDeviceId   The device identifier (bus, device, function).
      * @param   pMsiIn      The source MSI.
      * @param   pMsiOut     Where to store the remapped MSI.
@@ -1840 +1840 @@
      * @sa      iommuAmdDeviceMsiRemap().
      */
-    DECLCALLBACKMEMBER(int, pfnIommuMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDevIt, PCMSIMSG pMsiIn, PMSIMSG pMsiOut));
+    DECLCALLBACKMEMBER(int, pfnIommuMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDeviceId, PCMSIMSG pMsiIn, PMSIMSG pMsiOut));
 
     /** Just a safety precaution. */