Changeset 91885 in vbox for trunk/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp

Timestamp:

Oct 20, 2021 12:01:26 PM (3 years ago)

Author:

vboxsync

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

147689

Message:

Devices/PC/ACPI/VBoxAcpi.cpp: Access CFGM API only through the device helper callbacks, bugref:10074

File:

• trunk/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp

@@ -71 +71 @@
 static int patchAml(PPDMDEVINS pDevIns, uint8_t *pabAml, size_t cbAml)
 {
+    PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3;
+
     uint16_t cCpus;
-    int rc = CFGMR3QueryU16Def(pDevIns->pCfg, "NumCPUs", &cCpus, 1);
+    int rc = pHlp->pfnCFGMQueryU16Def(pDevIns->pCfg, "NumCPUs", &cCpus, 1);
     if (RT_FAILURE(rc))
         return rc;
@@ -78 +80 @@
     /* Clear CPU objects at all, if needed */
     bool fShowCpu;
-    rc = CFGMR3QueryBoolDef(pDevIns->pCfg, "ShowCpu", &fShowCpu, false);
+    rc = pHlp->pfnCFGMQueryBoolDef(pDevIns->pCfg, "ShowCpu", &fShowCpu, false);
     if (RT_FAILURE(rc))
         return rc;
@@ -146 +148 @@
 static int patchAmlCpuHotPlug(PPDMDEVINS pDevIns, uint8_t *pabAml, size_t cbAml)
 {
+    PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3;
+
     uint16_t cCpus;
-    int rc = CFGMR3QueryU16Def(pDevIns->pCfg, "NumCPUs", &cCpus, 1);
+    int rc = pHlp->pfnCFGMQueryU16Def(pDevIns->pCfg, "NumCPUs", &cCpus, 1);
     if (RT_FAILURE(rc))
         return rc;
@@ -286 +290 @@
                                uint8_t **ppabAmlCode, size_t *pcbAmlCode)
 {
+    PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3;
+
     char *pszAmlFilePath = NULL;
-    int rc = CFGMR3QueryStringAlloc(pDevIns->pCfg, pcszCfgName, &pszAmlFilePath);
+    int rc = pHlp->pfnCFGMQueryStringAlloc(pDevIns->pCfg, pcszCfgName, &pszAmlFilePath);
     if (RT_SUCCESS(rc))
     {
@@ -396 +402 @@
 int acpiPrepareSsdt(PPDMDEVINS pDevIns, void **ppvPtr, size_t *pcbSsdt)
 {
+    PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3;
+
     uint8_t *pabAmlCodeSsdt = NULL;
     size_t   cbAmlCodeSsdt = 0;
@@ -402 +410 @@
     {
         bool fCpuHotPlug = false;
-        rc = CFGMR3QueryBoolDef(pDevIns->pCfg, "CpuHotPlug", &fCpuHotPlug, false);
+        rc = pHlp->pfnCFGMQueryBoolDef(pDevIns->pCfg, "CpuHotPlug", &fCpuHotPlug, false);
         if (RT_SUCCESS(rc))
         {