Changeset 88636 in vbox for trunk/src/VBox

Timestamp:

Apr 21, 2021 5:54:15 PM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Fix pdmIommuIsPresent to refer to ring-3 pointer and a todo for the future.

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllIommu.cpp (modified) (2 diffs)

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

@@ -75 +75 @@
 bool pdmIommuIsPresent(PPDMDEVINS pDevIns)
 {
-    PPDMIOMMU pIommu = PDMDEVINS_TO_IOMMU(pDevIns);
-    return pIommu != 0;
+#ifdef IN_RING0
+    PCPDMIOMMUR3 pIommuR3 = &pDevIns->Internal.s.pGVM->pdm.s.aIommus[0];
+#else
+    PCPDMIOMMUR3 pIommuR3 = &pDevIns->Internal.s.pVMR3->pdm.s.aIommus[0];
+#endif
+    return pIommuR3->pDevInsR3 != NULL;
 }
 
@@ -96 +100 @@
         return rc;
     }
+    /** @todo Should we return an rc such that we can reschedule to R3 if R0 isn't
+     *        enabled?  Is that even viable with the state the I/O APIC would be in? */
     return VERR_IOMMU_NOT_PRESENT;
 }