Changeset 94342 in vbox for trunk/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp

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/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp

@@ -26 +26 @@
 #include <iprt/alloc.h>
 #include <iprt/string.h>
+#include <iprt/uuid.h>
 
 #include "../USBProxyDevice.h"
@@ -43 +44 @@
  */
 
-static DECLCALLBACK(int) usbProxyVrdpOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend)
-{
-    LogFlow(("usbProxyVrdpOpen: pProxyDev=%p pszAddress=%s, pvBackend=%p\n", pProxyDev, pszAddress, pvBackend));
-
-    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
-    int rc = VINF_SUCCESS;
+static DECLCALLBACK(int) usbProxyVrdpOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress)
+{
+    LogFlow(("usbProxyVrdpOpen: pProxyDev=%p pszAddress=%s\n", pProxyDev, pszAddress));
+
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
+    PPDMUSBINS       pUsbIns  = pProxyDev->pUsbIns;
+    PCPDMUSBHLP      pHlp     = pUsbIns->pHlpR3;
+
+    PCFGMNODE pCfgBackend = pHlp->pfnCFGMGetChild(pUsbIns->pCfg, "BackendCfg");
+    AssertPtrReturn(pCfgBackend, VERR_NOT_FOUND);
+
+    uint32_t idClient = 0;
+    int rc = pHlp->pfnCFGMQueryU32(pCfgBackend, "ClientId", &idClient);
+    AssertRCReturn(rc, rc);
+
+    RTUUID UuidDev;
+    char *pszUuid = NULL;
+
+    rc = pHlp->pfnCFGMQueryStringAlloc(pUsbIns->pCfg, "UUID", &pszUuid);
+    AssertRCReturn(rc, rc);
+
+    rc = RTUuidFromStr(&UuidDev, pszUuid);
+    pHlp->pfnMMHeapFree(pUsbIns, pszUuid);
+    AssertMsgRCReturn(rc, ("Failed to convert UUID from string! rc=%Rrc\n", rc), rc);
 
     if (strncmp (pszAddress, REMOTE_USB_BACKEND_PREFIX_S, REMOTE_USB_BACKEND_PREFIX_LEN) == 0)
     {
-        REMOTEUSBCALLBACK *pCallback = (REMOTEUSBCALLBACK *)pvBackend;
+        RTUUID UuidRemoteUsbIf;
+        rc = RTUuidFromStr(&UuidRemoteUsbIf, REMOTEUSBIF_OID); AssertRC(rc);
+
+        PREMOTEUSBIF pRemoteUsbIf = (PREMOTEUSBIF)PDMUsbHlpQueryGenericUserObject(pUsbIns, &UuidRemoteUsbIf);
+        AssertPtrReturn(pRemoteUsbIf, VERR_INVALID_PARAMETER);
+
+        REMOTEUSBCALLBACK *pCallback = pRemoteUsbIf->pfnQueryRemoteUsbBackend(pRemoteUsbIf->pvUser, &UuidDev, idClient);
+        AssertPtrReturn(pCallback, VERR_INVALID_PARAMETER);
+
         PREMOTEUSBDEVICE pDevice = NULL;
-
-        rc = pCallback->pfnOpen (pCallback->pInstance, pszAddress, strlen (pszAddress) + 1, &pDevice);
-
-        if (RT_SUCCESS (rc))
+        rc = pCallback->pfnOpen(pCallback->pInstance, pszAddress, strlen (pszAddress) + 1, &pDevice);
+        if (RT_SUCCESS(rc))
         {
             pDevVrdp->pCallback = pCallback;