Changeset 91867 in vbox for trunk/src/VBox/Devices/Security

Timestamp:

Oct 20, 2021 9:05:23 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147670

Message:

Devices/Security: Change the TPM drivers to access the CFGM API through the driver helper callback table only, bugref:10074

Location:

trunk/src/VBox/Devices/Security

Files:

• DrvTpmEmu.cpp (modified) (3 diffs)
• DrvTpmEmuTpms.cpp (modified) (3 diffs)
• DrvTpmHost.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Security/DrvTpmEmu.cpp

@@ -820 +820 @@
     RT_NOREF(fFlags);
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-    PDRVTPMEMU pThis = PDMINS_2_DATA(pDrvIns, PDRVTPMEMU);
+    PDRVTPMEMU      pThis = PDMINS_2_DATA(pDrvIns, PDRVTPMEMU);
+    PCPDMDRVHLPR3   pHlp  = pDrvIns->pHlpR3;
 
     /*
@@ -848 +849 @@
 
     char szLocation[_1K];
-    int rc = CFGMR3QueryString(pCfg, "Location", &szLocation[0], sizeof(szLocation));
+    int rc = pHlp->pfnCFGMQueryString(pCfg, "Location", &szLocation[0], sizeof(szLocation));
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
@@ -931 +932 @@
 
     /* Configure the buffer size. */
-    rc = CFGMR3QueryU32Def(pCfg, "BufferSize", &pThis->cbBuffer, cbBufferMax);
+    rc = pHlp->pfnCFGMQueryU32Def(pCfg, "BufferSize", &pThis->cbBuffer, cbBufferMax);
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,

trunk/src/VBox/Devices/Security/DrvTpmEmuTpms.cpp

@@ -362 +362 @@
     RT_NOREF(fFlags);
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-    PDRVTPMEMU pThis = PDMINS_2_DATA(pDrvIns, PDRVTPMEMU);
+    PDRVTPMEMU      pThis = PDMINS_2_DATA(pDrvIns, PDRVTPMEMU);
+    PCPDMDRVHLPR3   pHlp  = pDrvIns->pHlpR3;
 
     /*
@@ -407 +408 @@
     TPMLIB_TPMVersion enmVersion = TPMLIB_TPM_VERSION_2;
     uint32_t uTpmVersion = 0;
-    rc = CFGMR3QueryU32Def(pCfg, "TpmVersion", &uTpmVersion, 2);
+    rc = pHlp->pfnCFGMQueryU32Def(pCfg, "TpmVersion", &uTpmVersion, 2);
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
@@ -438 +439 @@
                                    N_("Querying the maximum supported buffer size failed with %u"), rcTpm);
 
-    rc = CFGMR3QueryU32Def(pCfg, "BufferSize", &pThis->cbBuffer, (uint32_t)cbBufferMax);
+    rc = pHlp->pfnCFGMQueryU32Def(pCfg, "BufferSize", &pThis->cbBuffer, (uint32_t)cbBufferMax);
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,

trunk/src/VBox/Devices/Security/DrvTpmHost.cpp

@@ -277 +277 @@
     RT_NOREF(fFlags);
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-    PDRVTPMHOST pThis = PDMINS_2_DATA(pDrvIns, PDRVTPMHOST);
+    PDRVTPMHOST     pThis = PDMINS_2_DATA(pDrvIns, PDRVTPMHOST);
+    PCPDMDRVHLPR3   pHlp  = pDrvIns->pHlpR3;
 
     /*
@@ -302 +303 @@
 
     uint32_t idTpm = RTTPM_ID_DEFAULT;
-    int rc = CFGMR3QueryU32Def(pCfg, "TpmId", &idTpm, RTTPM_ID_DEFAULT);
+    int rc = pHlp->pfnCFGMQueryU32Def(pCfg, "TpmId", &idTpm, RTTPM_ID_DEFAULT);
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,