Changeset 94342 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 23, 2022 7:53:21 PM (3 years ago)

Author:

vboxsync

Message:

Main,VMM/PDMUsb,Devices/USB,VRDP: Drop passing pointers through CFGM in favor of using VMM2USERMETHODS::pfnQueryGenericObject, bugref:10053

File:

• trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp (modified) (4 diffs)

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

@@ -1019 +1019 @@
  * @param   pszBackend          The proxy backend to use.
  * @param   pszAddress          The address string.
- * @param   pvBackend           Pointer to the backend.
+ * @param   pSubTree            The CFGM subtree to incorporate into the settings
+ *                              (same restrictions as for CFGMR3InsertSubTree() apply),
+ *                              optional.
  * @param   enmSpeed            The speed the USB device is operating at.
  * @param   fMaskedIfs          The interfaces to hide from the guest.
  * @param   pszCaptureFilename  Path to the file for USB traffic capturing, optional.
  */
-VMMR3DECL(int) PDMR3UsbCreateProxyDevice(PUVM pUVM, PCRTUUID pUuid, const char *pszBackend, const char *pszAddress, void *pvBackend,
+VMMR3DECL(int) PDMR3UsbCreateProxyDevice(PUVM pUVM, PCRTUUID pUuid, const char *pszBackend, const char *pszAddress, PCFGMNODE pSubTree,
                                          VUSBSPEED enmSpeed, uint32_t fMaskedIfs, const char *pszCaptureFilename)
 {
@@ -1078 +1080 @@
         rc = CFGMR3InsertString(pConfig,  "UUID", szUuid);                      AssertRCBreak(rc);
         rc = CFGMR3InsertString(pConfig, "Backend", pszBackend);                AssertRCBreak(rc);
-        rc = CFGMR3InsertInteger(pConfig, "pvBackend", (uintptr_t)pvBackend);   AssertRCBreak(rc);
         rc = CFGMR3InsertInteger(pConfig, "MaskedIfs", fMaskedIfs);             AssertRCBreak(rc);
         rc = CFGMR3InsertInteger(pConfig, "Force11Device", !(pHub->fVersions & iUsbVersion)); AssertRCBreak(rc);
+        if (pSubTree)
+        {
+            rc = CFGMR3InsertSubTree(pConfig, "BackendCfg", pSubTree, NULL /*ppChild*/);
+            AssertRCBreak(rc);
+        }
     } while (0); /* break loop */
     if (RT_FAILURE(rc))
@@ -2176 +2182 @@
              pUsbIns->pReg->szName, pUsbIns->iInstance, enmReason));
     return enmReason;
+}
+
+
+/** @interface_method_impl{PDMUSBHLP,pfnQueryGenericUserObject} */
+static DECLCALLBACK(void *) pdmR3UsbHlp_QueryGenericUserObject(PPDMUSBINS pUsbIns, PCRTUUID pUuid)
+{
+    PDMUSB_ASSERT_USBINS(pUsbIns);
+    PVM  pVM  = pUsbIns->Internal.s.pVM;
+    PUVM pUVM = pVM->pUVM;
+
+    void *pvRet;
+    if (pUVM->pVmm2UserMethods->pfnQueryGenericObject)
+        pvRet = pUVM->pVmm2UserMethods->pfnQueryGenericObject(pUVM->pVmm2UserMethods, pUVM, pUuid);
+    else
+        pvRet = NULL;
+
+    Log(("pdmR3UsbHlp_QueryGenericUserObject: caller='%s'/%d: returns %#p for %RTuuid\n",
+         pUsbIns->pReg->szName, pUsbIns->iInstance, pvRet, pUuid));
+    return pvRet;
 }
 
@@ -2376 +2401 @@
     pdmR3UsbHlp_VMGetSuspendReason,
     pdmR3UsbHlp_VMGetResumeReason,
-    NULL,
+    pdmR3UsbHlp_QueryGenericUserObject,
     NULL,
     NULL,