Changeset 89065 in vbox for trunk/src/VBox

Timestamp:

May 17, 2021 5:40:02 AM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 Add pfnLockIsOwner for I/O APIC helper (for upcoming changes).

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/PDMR0DevHlp.cpp (modified) (2 diffs)
• VMMR3/PDMDevMiscHlp.cpp (modified) (2 diffs)

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

@@ -1529 +1529 @@
 
 
+/** @interface_method_impl{PDMIOAPICHLP,pfnUnlock} */
+static DECLCALLBACK(bool) pdmR0IoApicHlp_LockIsOwner(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    return pdmLockIsOwner(pDevIns->Internal.s.pGVM);
+}
+
+
 /** @interface_method_impl{PDMIOAPICHLP,pfnIommuMsiRemap} */
 static DECLCALLBACK(int) pdmR0IoApicHlp_IommuMsiRemap(PPDMDEVINS pDevIns, uint16_t idDevice, PCMSIMSG pMsiIn, PMSIMSG pMsiOut)
@@ -1561 +1569 @@
     pdmR0IoApicHlp_Lock,
     pdmR0IoApicHlp_Unlock,
+    pdmR0IoApicHlp_LockIsOwner,
     pdmR0IoApicHlp_IommuMsiRemap,
     PDM_IOAPICHLP_VERSION

trunk/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp

@@ -141 +141 @@
 
 
+/** @interface_method_impl{PDMIOAPICHLP,pfnLockIsOwner} */
+static DECLCALLBACK(bool) pdmR3IoApicHlp_LockIsOwner(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR3IoApicHlp_LockIsOwner: caller='%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance));
+    return pdmLockIsOwner(pDevIns->Internal.s.pVMR3);
+}
+
+
 /** @interface_method_impl{PDMIOAPICHLP,pfnIommuMsiRemap} */
 static DECLCALLBACK(int) pdmR3IoApicHlp_IommuMsiRemap(PPDMDEVINS pDevIns, uint16_t idDevice, PCMSIMSG pMsiIn, PMSIMSG pMsiOut)
@@ -167 +176 @@
     pdmR3IoApicHlp_Lock,
     pdmR3IoApicHlp_Unlock,
+    pdmR3IoApicHlp_LockIsOwner,
     pdmR3IoApicHlp_IommuMsiRemap,
     PDM_IOAPICHLP_VERSION /* the end */