Changeset 89066 in vbox

Timestamp:

May 17, 2021 5:41:08 AM (4 years ago)

Author:

vboxsync

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

144406

Message:

Intel IOMMU: bugref:9967 DevIoApic: Add macros for checking PDM lock ownership and asserts to helper function pointers.

File:

• trunk/src/VBox/Devices/PC/DevIoApic.cpp (modified) (3 diffs)

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

@@ -206 +206 @@
 # define IOAPIC_LOCK(a_pDevIns, a_pThis, a_pThisCC, rcBusy)  (a_pThisCC)->pIoApicHlp->pfnLock((a_pDevIns), (rcBusy))
 # define IOAPIC_UNLOCK(a_pDevIns, a_pThis, a_pThisCC)        (a_pThisCC)->pIoApicHlp->pfnUnlock((a_pDevIns))
+# define IOAPIC_LOCK_IS_OWNER(a_pDevIns, a_pThis, a_pThisCC) (a_pThisCC)->pIoApicHlp->pfnLockIsOwner((a_pDevIns))
 #else
 # define IOAPIC_LOCK(a_pDevIns, a_pThis, a_pThisCC, rcBusy)  PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSect, (rcBusy))
 # define IOAPIC_UNLOCK(a_pDevIns, a_pThis, a_pThisCC)        PDMDevHlpCritSectLeave((a_pDevIns), &(a_pThis)->CritSect)
+# define IOAPIC_LOCK_IS_OWNER(a_pDevIns, a_pThis, a_pThisCC) PDMDevHlpCritSectIsOwner((a_pDevIns), &(a_pThis)->CritSect)
 #endif
 
@@ -1606 +1608 @@
     rc = PDMDevHlpIoApicRegister(pDevIns, &IoApicReg, &pThisCC->pIoApicHlp);
     AssertRCReturn(rc, rc);
+    AssertPtr(pThisCC->pIoApicHlp->pfnApicBusDeliver);
+    AssertPtr(pThisCC->pIoApicHlp->pfnLock);
+    AssertPtr(pThisCC->pIoApicHlp->pfnUnlock);
+    AssertPtr(pThisCC->pIoApicHlp->pfnIsLockOwner);
+    AssertPtr(pThisCC->pIoApicHlp->pfnIommuMsiRemap);
 
     /*
@@ -1696 +1703 @@
     rc = PDMDevHlpIoApicSetUpContext(pDevIns, &IoApicReg, &pThisCC->pIoApicHlp);
     AssertRCReturn(rc, rc);
+    AssertPtr(pThisCC->pIoApicHlp->pfnApicBusDeliver);
+    AssertPtr(pThisCC->pIoApicHlp->pfnLock);
+    AssertPtr(pThisCC->pIoApicHlp->pfnUnlock);
+    AssertPtr(pThisCC->pIoApicHlp->pfnIsLockOwner);
+    AssertPtr(pThisCC->pIoApicHlp->pfnIommuMsiRemap);
 
     rc = PDMDevHlpMmioSetUpContext(pDevIns, pThis->hMmio, ioapicMmioWrite, ioapicMmioRead, NULL /*pvUser*/);