Changeset 89949 in vbox for trunk

Timestamp:

Jun 29, 2021 12:18:45 PM (4 years ago)

Author:

vboxsync

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

145407

Message:

VMM/PDMDriver: Add PDMDRVHLPR3::pfnQueryGenericUserObject/PDMDevHlpQueryGenericUserObject mapping to VMM2USERMETHODS::pfnQueryGenericObject, bugref:10053

Location:

trunk

Files:

• include/VBox/vmm/pdmdrv.h (modified) (3 diffs)
• src/VBox/VMM/VMMR3/PDMDriver.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmdrv.h

@@ -1335 +1335 @@
     DECLR3CALLBACKMEMBER(int, pfnSTAMDeregisterByPrefix,(PPDMDRVINS pDrvIns, const char *pszPrefix));
 
+    /**
+     * Queries a generic object from the VMM user.
+     *
+     * @returns Pointer to the object if found, NULL if not.
+     * @param   pDrvIns     The driver instance.
+     * @param   pUuid       The UUID of what's being queried.  The UUIDs and
+     *                      the usage conventions are defined by the user.
+     */
+    DECLR3CALLBACKMEMBER(void *, pfnQueryGenericUserObject,(PPDMDRVINS pDrvIns, PCRTUUID pUuid));
+
     DECLR3CALLBACKMEMBER(void, pfnReserved2,(PPDMDRVINS pDrvIns));
     DECLR3CALLBACKMEMBER(void, pfnReserved3,(PPDMDRVINS pDrvIns));
@@ -1342 +1352 @@
     DECLR3CALLBACKMEMBER(void, pfnReserved7,(PPDMDRVINS pDrvIns));
     DECLR3CALLBACKMEMBER(void, pfnReserved8,(PPDMDRVINS pDrvIns));
-    DECLR3CALLBACKMEMBER(void, pfnReserved9,(PPDMDRVINS pDrvIns));
     /** @}  */
 
@@ -1864 +1873 @@
 }
 
+/**
+ * @copydoc PDMDRVHLPR3::pfnQueryGenericUserObject
+ */
+DECLINLINE(void *) PDMDrvHlpQueryGenericUserObject(PPDMDRVINS pDrvIns, PCRTUUID pUuid)
+{
+    return pDrvIns->pHlpR3->pfnQueryGenericUserObject(pDrvIns, pUuid);
+}
+
 
 /** Pointer to callbacks provided to the VBoxDriverRegister() call. */

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

@@ -1876 +1876 @@
 
 
+/** @interface_method_impl{PDMDRVHLPR3,pfnQueryGenericUserObject} */
+static DECLCALLBACK(void *) pdmR3DrvHlp_QueryGenericUserObject(PPDMDRVINS pDrvIns, PCRTUUID pUuid)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    LogFlow(("pdmR3DrvHlp_QueryGenericUserObject: caller='%s'/%d: pUuid=%p:%RTuuid\n",
+             pDrvIns->pReg->szName, pDrvIns->iInstance, pUuid, pUuid));
+
+    void *pvRet;
+    PUVM  pUVM = pDrvIns->Internal.s.pVMR3->pUVM;
+    if (pUVM->pVmm2UserMethods->pfnQueryGenericObject)
+        pvRet = pUVM->pVmm2UserMethods->pfnQueryGenericObject(pUVM->pVmm2UserMethods, pUVM, pUuid);
+    else
+        pvRet = NULL;
+
+    LogRel(("pdmR3DrvHlp_QueryGenericUserObject: caller='%s'/%d: returns %#p for %RTuuid\n",
+            pDrvIns->pReg->szName, pDrvIns->iInstance, pvRet, pUuid));
+    return pvRet;
+}
+
+
 /**
  * The driver helper structure.
@@ -1927 +1947 @@
     pdmR3DrvHlp_TimerSetMillies,
     pdmR3DrvHlp_STAMDeregisterByPrefix,
-    NULL,
+    pdmR3DrvHlp_QueryGenericUserObject,
     NULL,
     NULL,