Changeset 91960 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 21, 2021 3:01:54 PM (3 years ago)

Author:

vboxsync

Message:

VMM,DevPciBios: Add helper callback for PDMR3QueryLun and make use of it, also replace CPUMGetGuestMicroarch with PDMDevHlpCpuGetGuestMicroarch, bugref:10074

File:

• trunk/src/VBox/Devices/PC/DevPcBios.cpp (modified) (6 diffs)

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

@@ -769 +769 @@
     uint32_t        u32;
     unsigned        i;
-    PUVM            pUVM = PDMDevHlpGetUVM(pDevIns); AssertRelease(pUVM);
     PPDMIMEDIA      apHDs[4] = {0};
     LogFlow(("pcbiosInitComplete:\n"));
@@ -862 +861 @@
     {
         PPDMIBASE pBase;
-        int rc = PDMR3QueryLun(pUVM, pThis->pszFDDevice, 0, i, &pBase);
+        int rc = PDMDevHlpQueryLun(pDevIns, pThis->pszFDDevice, 0, i, &pBase);
         if (RT_SUCCESS(rc))
         {
@@ -904 +903 @@
     {
         PPDMIBASE pBase;
-        int rc = PDMR3QueryLun(pUVM, pThis->pszHDDevice, 0, i, &pBase);
+        int rc = PDMDevHlpQueryLun(pDevIns, pThis->pszHDDevice, 0, i, &pBase);
         if (RT_SUCCESS(rc))
             apHDs[i] = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIA);
@@ -965 +964 @@
         {
             PPDMIBASE pBase;
-            int rc = PDMR3QueryLun(pUVM, pThis->pszSataDevice, 0, pThis->iSataHDLUN[i], &pBase);
+            int rc = PDMDevHlpQueryLun(pDevIns, pThis->pszSataDevice, 0, pThis->iSataHDLUN[i], &pBase);
             if (RT_SUCCESS(rc))
                 apHDs[i] = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIA);
@@ -1019 +1018 @@
         {
             PPDMIBASE pBase;
-            int rc = PDMR3QueryLun(pUVM, pThis->pszScsiDevice, 0, pThis->iScsiHDLUN[i], &pBase);
+            int rc = PDMDevHlpQueryLun(pDevIns, pThis->pszScsiDevice, 0, pThis->iScsiHDLUN[i], &pBase);
             if (RT_SUCCESS(rc))
                 apHDs[i] = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIA);
@@ -1501 +1500 @@
      * Get the CPU arch so we can load the appropriate ROMs.
      */
-    PVM pVM = PDMDevHlpGetVM(pDevIns);
-    CPUMMICROARCH const enmMicroarch = pVM ? CPUMGetGuestMicroarch(pVM) : kCpumMicroarch_Intel_P6;
+    CPUMMICROARCH const enmMicroarch = pVM ? PDMDevHlpCpuGetGuestMicroarch(pDevIns) : kCpumMicroarch_Intel_P6;
 
     if (pThis->pszPcBiosFile)