Changeset 91897 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Oct 20, 2021 1:42:39 PM (3 years ago)

Author:

vboxsync

Message:

VMM,Devices: Add callbacks to required MMR3* APIs to the helper callbacks tables and convert devices and drivers to make use of those, bugref:10074

Location:

trunk/src/VBox/Devices/PC

Files:

• ACPI/VBoxAcpi.cpp (modified) (1 diff)
• DevACPI.cpp (modified) (1 diff)
• DevFwCommon.cpp (modified) (1 diff)
• DevPcArch.cpp (modified) (1 diff)
• DevPcBios.cpp (modified) (1 diff)
• DevQemuFwCfg.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp

@@ -347 +347 @@
             RTFileClose(hFileAml);
         }
-        MMR3HeapFree(pszAmlFilePath);
+        PDMDevHlpMMHeapFree(pDevIns, pszAmlFilePath);
     }
 

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

@@ -3774 +3774 @@
      * The latter starts never below 4G.
      */
-    PVM pVM                    = PDMDevHlpGetVM(pDevIns);
-    uint32_t        cbBelow4GB = MMR3PhysGetRamSizeBelow4GB(pVM);
-    uint64_t const  cbAbove4GB = MMR3PhysGetRamSizeAbove4GB(pVM);
-
-    pThis->u64RamSize = MMR3PhysGetRamSize(pVM);
+    uint32_t        cbBelow4GB = PDMDevHlpMMPhysGetRamSizeBelow4GB(pDevIns);
+    uint64_t const  cbAbove4GB = PDMDevHlpMMPhysGetRamSizeAbove4GB(pDevIns);
+
+    pThis->u64RamSize = PDMDevHlpMMPhysGetRamSize(pDevIns);
     if (pThis->fPciPref64Enabled)
     {

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

@@ -826 +826 @@
          * DMI Physical Memory Array (Type 16) *
          ***************************************/
-        uint64_t const  cbRamSize = MMR3PhysGetRamSize(PDMDevHlpGetVM(pDevIns));
+        uint64_t const  cbRamSize = PDMDevHlpMMPhysGetRamSize(pDevIns);
 
         PDMIRAMARRAY pMemArray = (PDMIRAMARRAY)pszStr;

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

@@ -244 +244 @@
                                                pcarchReservedMemoryWrite, pcarchReservedMemoryRead,
                                                IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU | IOMMMIO_FLAGS_ABS,
-                                               MMR3HeapAPrintf(pVM, MM_TAG_PGM_PHYS /* bad bird*/, "PC Arch Reserved #%u", iRegion),
+                                               PDMDevHlpMMHeapAPrintf(pDevIns, MM_TAG_PGM_PHYS /* bad bird*/, "PC Arch Reserved #%u", iRegion),
                                                &hMmioRegion);
             AssertLogRelRCReturn(rc, rc);

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

@@ -773 +773 @@
     LogFlow(("pcbiosInitComplete:\n"));
 
-    PVM pVM                    = PDMDevHlpGetVM(pDevIns);
-    uint64_t const  cbRamSize  = MMR3PhysGetRamSize(pVM);
-    uint32_t const  cbBelow4GB = MMR3PhysGetRamSizeBelow4GB(pVM);
-    uint64_t const  cbAbove4GB = MMR3PhysGetRamSizeAbove4GB(pVM);
+    uint64_t const  cbRamSize  = PDMDevHlpMMPhysGetRamSize(pDevIns);
+    uint32_t const  cbBelow4GB = PDMDevHlpMMPhysGetRamSizeBelow4GB(pDevIns);
+    uint64_t const  cbAbove4GB = PDMDevHlpMMPhysGetRamSizeAbove4GB(pDevIns);
 
     /*

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

@@ -323 +323 @@
         else
             LogRel(("QemuFwCfg: Failed to open file \"%s\" -> %Rrc\n", pszFilePath, rc));
-        MMR3HeapFree(pszFilePath);
+        PDMDevHlpMMHeapFree(pThis->pDevIns, pszFilePath);
     }
     else
@@ -405 +405 @@
         else
             LogRel(("QemuFwCfg: Failed to open file \"%s\" -> %Rrc\n", pszFilePath, rc));
-        MMR3HeapFree(pszFilePath);
+        PDMDevHlpMMHeapFree(pThis->pDevIns, pszFilePath);
     }
     else