Changeset 91960 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147766

Message:

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

File:

• trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (5 diffs)

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 */
 };