Changeset 91960 in vbox

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

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (2 diffs)
• src/VBox/Devices/PC/DevPcBios.cpp (modified) (6 diffs)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (5 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -4940 +4940 @@
     DECLR3CALLBACKMEMBER(int, pfnSharedModuleCheckAll,(PPDMDEVINS pDevIns));
 
+    /**
+     * Query the interface of the top level driver on a LUN.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns             The device instance.
+     * @param   pszDevice           Device name.
+     * @param   iInstance           Device instance.
+     * @param   iLun                The Logical Unit to obtain the interface of.
+     * @param   ppBase              Where to store the base interface pointer.
+     *
+     * @remark  We're not doing any locking ATM, so don't try call this at times when the
+     *          device chain is known to be updated.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnQueryLun,(PPDMDEVINS pDevIns, const char *pszDevice, unsigned iInstance, unsigned iLun, PPPDMIBASE ppBase));
+
     /** @} */
 
@@ -9340 +9355 @@
 }
 
+/**
+ * @copydoc PDMDEVHLPR3::pfnQueryLun
+ */
+DECLINLINE(int) PDMDevHlpQueryLun(PPDMDEVINS pDevIns, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMIBASE *ppBase)
+{
+    return pDevIns->pHlpR3->pfnQueryLun(pDevIns, pszDevice, iInstance, iLun, ppBase);
+}
+
 /** 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/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)

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -4665 +4665 @@
 
     LogFlow(("pdmR3DevHlp_SharedModuleCheckAll: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
+    return rc;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnQueryLun} */
+static DECLCALLBACK(int) pdmR3DevHlp_pfnQueryLun(PPDMDEVINS pDevIns, const char *pszDevice,
+                                                 unsigned iInstance, unsigned iLun, PPDMIBASE *ppBase)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+
+    LogFlow(("pdmR3DevHlp_pfnQueryLun: caller='%s'/%d: pszDevice=%p:{%s} iInstance=%u iLun=%u ppBase=%p\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, pszDevice, pszDevice, iInstance, iLun, ppBase));
+
+    int rc = PDMR3QueryLun(pDevIns->Internal.s.pVMR3->pUVM, pszDevice, iInstance, iLun, ppBase);
+
+    LogFlow(("pdmR3DevHlp_pfnQueryLun: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
     return rc;
 }
@@ -5051 +5067 @@
     pdmR3DevHlp_SharedModuleGetPageState,
     pdmR3DevHlp_SharedModuleCheckAll,
+    pdmR3DevHlp_pfnQueryLun,
     PDM_DEVHLPR3_VERSION /* the end */
 };
@@ -5438 +5455 @@
     pdmR3DevHlp_SharedModuleGetPageState,
     pdmR3DevHlp_SharedModuleCheckAll,
+    pdmR3DevHlp_pfnQueryLun,
     PDM_DEVHLPR3_VERSION /* the end */
 };
@@ -5708 +5726 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
+    AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n",
+                            pDevIns->pReg->szName, pDevIns->iInstance));
+    return VERR_ACCESS_DENIED;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnQUeryLun} */
+static DECLCALLBACK(int) pdmR3DevHlp_Untrusted_QueryLun(PPDMDEVINS pDevIns, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMIBASE *ppBase)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    RT_NOREF(pszDevice, iInstance, iLun, ppBase);
     AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n",
                             pDevIns->pReg->szName, pDevIns->iInstance));
@@ -6096 +6125 @@
     pdmR3DevHlp_Untrusted_SharedModuleGetPageState,
     pdmR3DevHlp_Untrusted_SharedModuleCheckAll,
+    pdmR3DevHlp_Untrusted_QueryLun,
     PDM_DEVHLPR3_VERSION /* the end */
 };