Changeset 91937 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 21, 2021 11:38:29 AM (3 years ago)

Author:

vboxsync

Message:

Devices/Storage/DrvVD: Eliminate the last direct calls to CFGMR3* and use the driver helper callbacks, bguref:10074

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (16 diffs)

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -252 +252 @@
 /** Number of bins for allocated requests. */
 #define DRVVD_VDIOREQ_ALLOC_BINS    8
+
+/**
+ * VD config node.
+ */
+typedef struct VDCFGNODE
+{
+    /** List node for the list of config nodes. */
+    RTLISTNODE              NdLst;
+    /** Pointer to the driver helper callbacks. */
+    PCPDMDRVHLPR3           pHlp;
+    /** The config node. */
+    PCFGMNODE               pCfgNode;
+} VDCFGNODE;
+/** Pointer to a VD config node. */
+typedef VDCFGNODE *PVDCFGNODE;
 
 /**
@@ -368 +383 @@
     PVDREGIONLIST           pRegionList;
 
+    /** VD config support.
+     * @{ */
+    /** List head of config nodes. */
+    RTLISTANCHOR            LstCfgNodes;
+    /** @} */
+
     /** Cryptographic support
      * @{ */
     /** Pointer to the CFGM node containing the config of the crypto filter
      * if enable. */
-    PCFGMNODE                pCfgCrypto;
+    VDCFGNODE                CfgCrypto;
     /** Config interface for the encryption filter. */
     VDINTERFACECONFIG        VDIfCfg;
@@ -902 +923 @@
 static DECLCALLBACK(bool) drvvdCfgAreKeysValid(void *pvUser, const char *pszzValid)
 {
-    return CFGMR3AreValuesValid((PCFGMNODE)pvUser, pszzValid);
+    PVDCFGNODE      pVdCfgNode = (PVDCFGNODE)pvUser;
+    PCPDMDRVHLPR3   pHlp       = pVdCfgNode->pHlp;
+    return pHlp->pfnCFGMAreValuesValid(pVdCfgNode->pCfgNode, pszzValid);
 }
 
 static DECLCALLBACK(int) drvvdCfgQuerySize(void *pvUser, const char *pszName, size_t *pcb)
 {
-    return CFGMR3QuerySize((PCFGMNODE)pvUser, pszName, pcb);
+    PVDCFGNODE      pVdCfgNode = (PVDCFGNODE)pvUser;
+    PCPDMDRVHLPR3   pHlp       = pVdCfgNode->pHlp;
+    return pHlp->pfnCFGMQuerySize(pVdCfgNode->pCfgNode, pszName, pcb);
 }
 
 static DECLCALLBACK(int) drvvdCfgQuery(void *pvUser, const char *pszName, char *pszString, size_t cchString)
 {
-    return CFGMR3QueryString((PCFGMNODE)pvUser, pszName, pszString, cchString);
+    PVDCFGNODE      pVdCfgNode = (PVDCFGNODE)pvUser;
+    PCPDMDRVHLPR3   pHlp       = pVdCfgNode->pHlp;
+    return pHlp->pfnCFGMQueryString(pVdCfgNode->pCfgNode, pszName, pszString, cchString);
 }
 
 static DECLCALLBACK(int) drvvdCfgQueryBytes(void *pvUser, const char *pszName, void *ppvData, size_t cbData)
 {
-    return CFGMR3QueryBytes((PCFGMNODE)pvUser, pszName, ppvData, cbData);
+    PVDCFGNODE      pVdCfgNode = (PVDCFGNODE)pvUser;
+    PCPDMDRVHLPR3   pHlp       = pVdCfgNode->pHlp;
+    return pHlp->pfnCFGMQueryBytes(pVdCfgNode->pCfgNode, pszName, ppvData, cbData);
 }
 
@@ -1378 +1407 @@
 static int drvvdKeyCheckPrereqs(PVBOXDISK pThis, bool fSetError)
 {
-    if (   pThis->pCfgCrypto
+    if (   pThis->CfgCrypto.pCfgNode
         && !pThis->pIfSecKey)
     {
@@ -1492 +1521 @@
     }
 
-    if (   pThis->pCfgCrypto
+    if (   pThis->CfgCrypto.pCfgNode
         && !pThis->pIfSecKey)
         return VERR_VD_DEK_MISSING;
@@ -1680 +1709 @@
     int rc = VINF_SUCCESS;
 
-    if (pThis->pCfgCrypto)
+    if (pThis->CfgCrypto.pCfgNode)
     {
         PVDINTERFACE pVDIfFilter = NULL;
@@ -1702 +1731 @@
 
             rc = VDInterfaceAdd(&pThis->VDIfCfg.Core, "DrvVD_Config", VDINTERFACETYPE_CONFIG,
-                                pThis->pCfgCrypto, sizeof(VDINTERFACECONFIG), &pVDIfFilter);
+                                &pThis->CfgCrypto, sizeof(VDINTERFACECONFIG), &pVDIfFilter);
             AssertRC(rc);
 
@@ -2173 +2202 @@
     PVBOXDISK pThis = PDMINS_2_DATA(pDrvIns, PVBOXDISK);
 
-    Assert (!pThis->pCfgCrypto);
+    Assert (!pThis->CfgCrypto.pCfgNode);
 
     switch (enmXferDir)
@@ -3961 +3990 @@
         if (RT_SUCCESS(rc))
         {
+            VDCFGNODE CfgNode;
+
             VDIfConfig.pfnAreKeysValid = drvvdCfgAreKeysValid;
             VDIfConfig.pfnQuerySize    = drvvdCfgQuerySize;
             VDIfConfig.pfnQuery        = drvvdCfgQuery;
             VDIfConfig.pfnQueryBytes   = drvvdCfgQueryBytes;
+
+            CfgNode.pHlp     = pThis->pDrvIns->pHlpR3;
+            CfgNode.pCfgNode = pCfgFilterConfig;
             rc = VDInterfaceAdd(&VDIfConfig.Core, "DrvVD_Config", VDINTERFACETYPE_CONFIG,
-                                pCfgFilterConfig, sizeof(VDINTERFACECONFIG), &pVDIfsFilter);
+                                &CfgNode, sizeof(VDINTERFACECONFIG), &pVDIfsFilter);
             AssertRC(rc);
 
@@ -4476 +4510 @@
 
     drvvdStatsDeregister(pThis);
+
+    PVDCFGNODE pIt;
+    PVDCFGNODE pItNext;
+    RTListForEachSafe(&pThis->LstCfgNodes, pIt, pItNext, VDCFGNODE, NdLst)
+    {
+        RTListNodeRemove(&pIt->NdLst);
+        RTMemFreeZ(pIt, sizeof(*pIt));
+    }
 }
 
@@ -4513 +4555 @@
     pThis->uMergeSource                 = VD_LAST_IMAGE;
     pThis->uMergeTarget                 = VD_LAST_IMAGE;
-    pThis->pCfgCrypto                   = NULL;
+    pThis->CfgCrypto.pCfgNode           = NULL;
+    pThis->CfgCrypto.pHlp               = pDrvIns->pHlpR3;
     pThis->pIfSecKey                    = NULL;
     pThis->hIoReqCache                  = NIL_RTMEMCACHE;
@@ -4577 +4620 @@
     pThis->IMediaEx.pfnIoReqSuspendedLoad       = drvvdIoReqSuspendedLoad;
 
+    RTListInit(&pThis->LstCfgNodes);
+
     /* Initialize supported VD interfaces. */
     pThis->pVDIfsDisk = NULL;
@@ -4949 +4994 @@
 
     if (pThis->pDrvMediaExPort)
-        rc = IOBUFMgrCreate(&pThis->hIoBufMgr, cbIoBufMax, pThis->pCfgCrypto ? IOBUFMGR_F_REQUIRE_NOT_PAGABLE : IOBUFMGR_F_DEFAULT);
+        rc = IOBUFMgrCreate(&pThis->hIoBufMgr, cbIoBufMax, pThis->CfgCrypto.pCfgNode ? IOBUFMGR_F_REQUIRE_NOT_PAGABLE : IOBUFMGR_F_DEFAULT);
 
     if (   !fEmptyDrive
@@ -5084 +5129 @@
             pImage->VDIfConfig.pfnQuery        = drvvdCfgQuery;
             pImage->VDIfConfig.pfnQueryBytes   = NULL;
+
+            PVDCFGNODE pCfgNode = (PVDCFGNODE)RTMemAllocZ(sizeof(*pCfgNode));
+            if (RT_UNLIKELY(!pCfgNode))
+            {
+                rc = PDMDRV_SET_ERROR(pDrvIns, VERR_NO_MEMORY,
+                                      N_("DrvVD: Failed to allocate memory for config node"));
+                break;
+            }
+
+            pCfgNode->pHlp     = pDrvIns->pHlpR3;
+            pCfgNode->pCfgNode = pCfgVDConfig;
+            RTListAppend(&pThis->LstCfgNodes, &pCfgNode->NdLst);
+
             rc = VDInterfaceAdd(&pImage->VDIfConfig.Core, "DrvVD_Config", VDINTERFACETYPE_CONFIG,
-                                pCfgVDConfig, sizeof(VDINTERFACECONFIG), &pImage->pVDIfsImage);
+                                pCfgNode, sizeof(VDINTERFACECONFIG), &pImage->pVDIfsImage);
             AssertRC(rc);
 
@@ -5096 +5154 @@
              * crypto stuff.
              */
-            if (!pThis->pCfgCrypto)
+            if (!pThis->CfgCrypto.pCfgNode)
             {
                 if (pCfgVDConfig)
-                    pThis->pCfgCrypto = pHlp->pfnCFGMGetChild(pCfgVDConfig, "CRYPT");
-
-                if (pThis->pCfgCrypto)
+                    pThis->CfgCrypto.pCfgNode = pHlp->pfnCFGMGetChild(pCfgVDConfig, "CRYPT");
+
+                if (pThis->CfgCrypto.pCfgNode)
                 {
                     /* Setup VDConfig interface for disk encryption support. */
@@ -5315 +5373 @@
             && !pThis->fShareable
             && !fDiscard
-            && !pThis->pCfgCrypto /* Disk encryption disables the block cache for security reasons */
+            && !pThis->CfgCrypto.pCfgNode /* Disk encryption disables the block cache for security reasons */
             && RT_SUCCESS(rc))
         {