Changeset 91873 in vbox

Timestamp:

Oct 20, 2021 9:08:32 AM (3 years ago)

Author:

vboxsync

Message:

Devices/Network: Change the network drivers to access the CFGM API through the driver helper callback table only, bugref:10074 [missing file]

File:

• trunk/src/VBox/Devices/Network/DrvVMNet.m (modified) (7 diffs)

trunk/src/VBox/Devices/Network/DrvVMNet.m

@@ -480 +480 @@
 {
     RT_NOREF(fFlags);
-    PDRVVMNET pThis = PDMINS_2_DATA(pDrvIns, PDRVVMNET);
+    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
+    PDRVVMNET       pThis = PDMINS_2_DATA(pDrvIns, PDRVVMNET);
+    PCPDMDRVHLPR3   pHlp  = pDrvIns->pHlpR3;
+
     LogFlow(("drvVMNetConstruct: %p\n", pDrvIns));
-    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
 
     /*
@@ -525 +527 @@
      */
     char szUUID[40];
-    rc = CFGMR3QueryString(pCfg, "Id", szUUID, sizeof(szUUID));
+    rc = pHlp->pfnCFGMQueryString(pCfg, "Id", szUUID, sizeof(szUUID));
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         uuid_generate_random(pThis->uuid);
@@ -539 +541 @@
      */
     uint32_t u32TrunkType;
-    rc = CFGMR3QueryU32(pCfg, "TrunkType", &u32TrunkType);
+    rc = pHlp->pfnCFGMQueryU32(pCfg, "TrunkType", &u32TrunkType);
     if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -550 +552 @@
             * Get the network mask.
             */
-            rc = CFGMR3QueryString(pCfg, "NetworkMask", pThis->szNetworkMask, sizeof(pThis->szNetworkMask));
+            rc = pHlp->pfnCFGMQueryString(pCfg, "NetworkMask", pThis->szNetworkMask, sizeof(pThis->szNetworkMask));
             if (RT_FAILURE(rc))
                 return PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -558 +560 @@
             * Get the network mask.
             */
-            rc = CFGMR3QueryString(pCfg, "LowerIP", pThis->szLowerIP, sizeof(pThis->szLowerIP));
+            rc = pHlp->pfnCFGMQueryString(pCfg, "LowerIP", pThis->szLowerIP, sizeof(pThis->szLowerIP));
             if (RT_FAILURE(rc))
                 return PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -566 +568 @@
             * Get the network mask.
             */
-            rc = CFGMR3QueryString(pCfg, "UpperIP", pThis->szUpperIP, sizeof(pThis->szUpperIP));
+            rc = pHlp->pfnCFGMQueryString(pCfg, "UpperIP", pThis->szUpperIP, sizeof(pThis->szUpperIP));
             if (RT_FAILURE(rc))
                 return PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -579 +581 @@
             * The name of the host interface to use for bridging.
             */
-            rc = CFGMR3QueryString(pCfg, "Trunk", pThis->szHostInterface, sizeof(pThis->szHostInterface));
+            rc = pHlp->pfnCFGMQueryString(pCfg, "Trunk", pThis->szHostInterface, sizeof(pThis->szHostInterface));
             if (RT_FAILURE(rc))
                 return PDMDRV_SET_ERROR(pDrvIns, rc,