Changeset 91980 in vbox for trunk/src

Timestamp:

Oct 21, 2021 6:12:53 PM (3 years ago)

Author:

vboxsync

Message:

VMM,GIMDev: Missing PDMDevHlpGIMGetMmio2Regions for ring-0 variant, bugref:10074

Location:

trunk/src/VBox

Files:

• Devices/GIMDev/GIMDev.cpp (modified) (1 diff)
• VMM/VMMR0/PDMR0DevHlp.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/GIMDev/GIMDev.cpp

@@ -389 +389 @@
      */
 /** @todo r=bird: consider ditching this as GIM doesn't actually make use of it */
-    PVMCC           pVM       = PDMDevHlpGetVM(pDevIns);
     uint32_t        cRegions  = 0;
-    PGIMMMIO2REGION paRegions = GIMGetMmio2Regions(pVM, &cRegions);
+    PGIMMMIO2REGION paRegions = PDMDevHlpGIMGetMmio2Regions(pDevIns, &cRegions);
     if (   cRegions
         && paRegions)

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

@@ -1362 +1362 @@
          pDevIns->pReg->szName, pDevIns->iInstance, rc));
     return rc;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR0,pfnGIMGetMmio2Regions} */
+static DECLCALLBACK(PGIMMMIO2REGION) pdmR0DevHlp_GIMGetMmio2Regions(PPDMDEVINS pDevIns, uint32_t *pcRegions)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+
+    LogFlow(("pdmR0DevHlp_GIMGetMmio2Regions: caller='%s'/%d: pcRegions=%p\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, pcRegions));
+
+    PGIMMMIO2REGION pRegion = GIMGetMmio2Regions(pDevIns->Internal.s.pGVM, pcRegions);
+
+    LogFlow(("pdmR0DevHlp_GIMGetMmio2Regions: caller='%s'/%d: returns %p\n", pDevIns->pReg->szName, pDevIns->iInstance, pRegion));
+    return pRegion;
 }
 
@@ -1460 +1475 @@
     pdmR0DevHlp_MmioMapMmio2Page,
     pdmR0DevHlp_MmioResetRegion,
+    pdmR0DevHlp_GIMGetMmio2Regions,
     NULL /*pfnReserved1*/,
     NULL /*pfnReserved2*/,
@@ -1570 +1586 @@
     pdmR0DevHlp_MmioMapMmio2Page,
     pdmR0DevHlp_MmioResetRegion,
+    pdmR0DevHlp_GIMGetMmio2Regions,
     NULL /*pfnReserved1*/,
     NULL /*pfnReserved2*/,