Changeset 91980 in vbox

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

Files:

• include/VBox/vmm/pdmdev.h (modified) (4 diffs)
• src/VBox/Devices/GIMDev/GIMDev.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -5948 +5948 @@
     DECLR0CALLBACKMEMBER(int, pfnMmioResetRegion, (PPDMDEVINS pDevIns, IOMMMIOHANDLE hRegion));
 
+    /**
+     * Returns the array of MMIO2 regions that are expected to be registered and
+     * later mapped into the guest-physical address space for the GIM provider
+     * configured for the VM.
+     *
+     * @returns Pointer to an array of GIM MMIO2 regions, may return NULL.
+     * @param   pDevIns         Pointer to the GIM device instance.
+     * @param   pcRegions       Where to store the number of items in the array.
+     *
+     * @remarks The caller does not own and therefore must -NOT- try to free the
+     *          returned pointer.
+     */
+    DECLR0CALLBACKMEMBER(PGIMMMIO2REGION, pfnGIMGetMmio2Regions,(PPDMDEVINS pDevIns, uint32_t *pcRegions));
+
     /** Space reserved for future members.
      * @{ */
@@ -5971 +5985 @@
 
 /** Current PDMDEVHLP version number. */
-#define PDM_DEVHLPR0_VERSION                    PDM_VERSION_MAKE(0xffe5, 24, 0)
+#define PDM_DEVHLPR0_VERSION                    PDM_VERSION_MAKE(0xffe5, 25, 0)
 
 
@@ -9445 +9459 @@
     return pDevIns->pHlpR3->pfnGIMGetDebugSetup(pDevIns, pDbgSetup);
 }
+#endif
 
 /**
@@ -9451 +9466 @@
 DECLINLINE(PGIMMMIO2REGION) PDMDevHlpGIMGetMmio2Regions(PPDMDEVINS pDevIns, uint32_t *pcRegions)
 {
-    return pDevIns->pHlpR3->pfnGIMGetMmio2Regions(pDevIns, pcRegions);
-}
-
+    return pDevIns->CTX_SUFF(pHlp)->pfnGIMGetMmio2Regions(pDevIns, pcRegions);
+}
+
+#ifdef IN_RING3
 /** Wrapper around SSMR3GetU32 for simplifying getting enum values saved as uint32_t. */
 # define PDMDEVHLP_SSM_GET_ENUM32_RET(a_pHlp, a_pSSM, a_enmDst, a_EnumType) \

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*/,