Changeset 91871 in vbox

Timestamp:

Oct 20, 2021 9:06:26 AM (3 years ago)

Author:

vboxsync

Message:

Devices/USB: Change the USB roothub driver to access the CFGM API through the driver helper callback table only, bugref:10074

File:

• trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp

@@ -1270 +1270 @@
     RT_NOREF(fFlags);
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
+    PVUSBROOTHUB    pThis = PDMINS_2_DATA(pDrvIns, PVUSBROOTHUB);
+    PCPDMDRVHLPR3   pHlp  = pDrvIns->pHlpR3;
+
     LogFlow(("vusbRhConstruct: Instance %d\n", pDrvIns->iInstance));
-    PVUSBROOTHUB pThis = PDMINS_2_DATA(pDrvIns, PVUSBROOTHUB);
 
     /*
      * Validate configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "CaptureFilename\0"))
-        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
+    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "CaptureFilename", "");
 
     /*
@@ -1294 +1295 @@
 
     char *pszCaptureFilename = NULL;
-    rc = CFGMR3QueryStringAlloc(pCfg, "CaptureFilename", &pszCaptureFilename);
+    rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "CaptureFilename", &pszCaptureFilename);
     if (   RT_FAILURE(rc)
         && rc != VERR_CFGM_VALUE_NOT_FOUND)
@@ -1383 +1384 @@
      * The current implementation uses the VUSBIRHCONFIG interface for communication.
      */
-    PCPDMUSBHUBHLP pHlp; /* not used currently */
-    rc = PDMDrvHlpUSBRegisterHub(pDrvIns, pThis->fHcVersions, pThis->Hub.cPorts, &g_vusbHubReg, &pHlp);
+    PCPDMUSBHUBHLP pHlpUsb; /* not used currently */
+    rc = PDMDrvHlpUSBRegisterHub(pDrvIns, pThis->fHcVersions, pThis->Hub.cPorts, &g_vusbHubReg, &pHlpUsb);
     if (RT_FAILURE(rc))
         return rc;