Changeset 85992 in vbox for trunk/src

Timestamp:

Sep 2, 2020 10:44:05 AM (4 years ago)

Author:

vboxsync

Message:

Devices/VBoxAcpi.cpp: cleanups; make sure to return errors.

File:

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

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

@@ -68 +68 @@
 static int patchAml(PPDMDEVINS pDevIns, uint8_t *pabAml, size_t cbAml)
 {
-    uint16_t cNumCpus;
-    int rc;
-
-    rc = CFGMR3QueryU16Def(pDevIns->pCfg, "NumCPUs", &cNumCpus, 1);
-
+    uint16_t cCpus;
+    int rc = CFGMR3QueryU16Def(pDevIns->pCfg, "NumCPUs", &cCpus, 1);
     if (RT_FAILURE(rc))
         return rc;
@@ -83 +80 @@
 
     if (!fShowCpu)
-        cNumCpus = 0;
-
-    /**
+        cCpus = 0;
+
+    /*
      * Now search AML for:
      *  AML_PROCESSOR_OP            (UINT16) 0x5b83
@@ -97 +94 @@
          * AML_PROCESSOR_OP
          *
-         * DefProcessor := ProcessorOp PkgLength NameString ProcID
-                             PblkAddr PblkLen ObjectList
+         * DefProcessor := ProcessorOp PkgLength NameString ProcID PblkAddr PblkLen ObjectList
          * ProcessorOp  := ExtOpPrefix 0x83
          * ProcID       := ByteData
@@ -111 +107 @@
 
             /* Processor ID */
-            if (pabAml[i+7] < cNumCpus)
+            if (pabAml[i+7] < cCpus)
               continue;
 
@@ -138 +134 @@
     pabAml[9] = (uint8_t)(0 - bSum);
 
-    return 0;
+    return VINF_SUCCESS;
 }
 
@@ -147 +143 @@
 static int patchAmlCpuHotPlug(PPDMDEVINS pDevIns, uint8_t *pabAml, size_t cbAml)
 {
-    uint16_t cNumCpus;
-    int rc;
-    uint32_t idxAml = 0;
-
-    rc = CFGMR3QueryU16Def(pDevIns->pCfg, "NumCPUs", &cNumCpus, 1);
-
+    uint16_t cCpus;
+    int rc = CFGMR3QueryU16Def(pDevIns->pCfg, "NumCPUs", &cCpus, 1);
     if (RT_FAILURE(rc))
         return rc;
 
-    /**
+    /*
      * Now search AML for:
      *  AML_DEVICE_OP               (UINT16) 0x5b82
@@ -163 +155 @@
      * for VCPU not configured
      */
+    uint32_t idxAml = 0;
     while (idxAml < cbAml - 7)
     {
@@ -230 +223 @@
                     /* Processor ID */
                     uint8_t const idAmlCpu = pabAmlCpu[idxAmlCpu + 8];
-                    if (idAmlCpu < cNumCpus)
+                    if (idAmlCpu < cCpus)
                     {
                         LogFlow(("CPU %u is configured\n", idAmlCpu));
@@ -272 +265 @@
     pabAml[9] = (uint8_t)(0 - bSum);
 
-    return 0;
+    return VINF_SUCCESS;
 }
 
@@ -287 +280 @@
  * @param   pcbAmlCode     Where to store the number of bytes of the AML code on success.
  */
-static int acpiAmlLoadExternal(PPDMDEVINS pDevIns, const char *pcszCfgName, const char *pcszSignature, uint8_t **ppabAmlCode, size_t *pcbAmlCode)
-{
-    uint8_t *pabAmlCode = NULL;
-    size_t cbAmlCode = 0;
+static int acpiAmlLoadExternal(PPDMDEVINS pDevIns, const char *pcszCfgName, const char *pcszSignature,
+                               uint8_t **ppabAmlCode, size_t *pcbAmlCode)
+{
     char *pszAmlFilePath = NULL;
     int rc = CFGMR3QueryStringAlloc(pDevIns->pCfg, pcszCfgName, &pszAmlFilePath);
-
     if (RT_SUCCESS(rc))
     {
         /* Load from file. */
-        RTFILE FileAml = NIL_RTFILE;
-
-        rc = RTFileOpen(&FileAml, pszAmlFilePath, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE);
+        RTFILE hFileAml = NIL_RTFILE;
+        rc = RTFileOpen(&hFileAml, pszAmlFilePath, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE);
         if (RT_SUCCESS(rc))
         {
             /*
-             * An AML file contains the raw DSDT thus the size of the file
-             * is equal to the size of the DSDT.
+             * An AML file contains the raw DSDT or SSDT thus the size of the file
+             * is equal to the size of the DSDT or SSDT.
              */
             uint64_t cbAmlFile = 0;
-            rc = RTFileQuerySize(FileAml, &cbAmlFile);
-
-            cbAmlCode = (size_t)cbAmlFile;
-
-            /* Don't use AML files over 4GB ;) */
+            rc = RTFileQuerySize(hFileAml, &cbAmlFile);
+
+            /* Don't use AML files over 32MiB. */
             if (   RT_SUCCESS(rc)
-                && ((uint64_t)cbAmlCode == cbAmlFile))
-            {
-                pabAmlCode = (uint8_t *)RTMemAllocZ(cbAmlCode);
+                && cbAmlFile <= _32M)
+            {
+                size_t const cbAmlCode = (size_t)cbAmlFile;
+                uint8_t *pabAmlCode = (uint8_t *)RTMemAllocZ(cbAmlCode);
                 if (pabAmlCode)
                 {
-                    rc = RTFileReadAt(FileAml, 0, pabAmlCode, cbAmlCode, NULL);
+                    rc = RTFileReadAt(hFileAml, 0, pabAmlCode, cbAmlCode, NULL);
 
                     /*
@@ -344 +333 @@
                     rc = VERR_NO_MEMORY;
             }
-
-            RTFileClose(FileAml);
+            else if (RT_SUCCESS(rc))
+                rc = VERR_OUT_OF_RANGE;
+
+            RTFileClose(hFileAml);
         }
         MMR3HeapFree(pszAmlFilePath);
@@ -363 +354 @@
     size_t cbAmlCodeDsdt = 0;
     int rc = acpiAmlLoadExternal(pDevIns, "DsdtFilePath", "DSDT", &pabAmlCodeDsdt, &cbAmlCodeDsdt);
-
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
     {
-        rc = VINF_SUCCESS;
-
         /* Use the compiled in AML code */
         cbAmlCodeDsdt = sizeof(AmlCode);
-        pabAmlCodeDsdt = (uint8_t *)RTMemAllocZ(cbAmlCodeDsdt);
+        pabAmlCodeDsdt = (uint8_t *)RTMemDup(AmlCode, cbAmlCodeDsdt);
         if (pabAmlCodeDsdt)
-            memcpy(pabAmlCodeDsdt, AmlCode, cbAmlCodeDsdt);
+            rc = VINF_SUCCESS;
         else
             rc = VERR_NO_MEMORY;
     }
     else if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed to read \"DsdtFilePath\""));
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to read \"DsdtFilePath\""));
 
     if (RT_SUCCESS(rc))
@@ -409 +396 @@
     size_t   cbAmlCodeSsdt = 0;
     int rc = acpiAmlLoadExternal(pDevIns, "SsdtFilePath", "SSDT", &pabAmlCodeSsdt, &cbAmlCodeSsdt);
-
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
     {
         bool fCpuHotPlug = false;
-        uint8_t *pabAmlCode = NULL;
         rc = CFGMR3QueryBoolDef(pDevIns->pCfg, "CpuHotPlug", &fCpuHotPlug, false);
-
-        if (RT_FAILURE(rc))
-            return rc;
-
-        if (fCpuHotPlug)
+        if (RT_SUCCESS(rc))
         {
-            pabAmlCode     = AmlCodeSsdtCpuHotPlug;
-            cbAmlCodeSsdt = sizeof(AmlCodeSsdtCpuHotPlug);
+            if (fCpuHotPlug)
+            {
+                cbAmlCodeSsdt  = sizeof(AmlCodeSsdtCpuHotPlug);
+                pabAmlCodeSsdt = (uint8_t *)RTMemDup(AmlCodeSsdtCpuHotPlug, sizeof(AmlCodeSsdtCpuHotPlug));
+            }
+            else
+            {
+                cbAmlCodeSsdt  = sizeof(AmlCodeSsdtStandard);
+                pabAmlCodeSsdt = (uint8_t *)RTMemDup(AmlCodeSsdtStandard, sizeof(AmlCodeSsdtStandard));
+            }
+            if (pabAmlCodeSsdt)
+            {
+                if (fCpuHotPlug)
+                    patchAmlCpuHotPlug(pDevIns, pabAmlCodeSsdt, cbAmlCodeSsdt);
+                else
+                    patchAml(pDevIns, pabAmlCodeSsdt, cbAmlCodeSsdt);
+            }
+            else
+                rc = VERR_NO_MEMORY;
         }
-        else
-        {
-            pabAmlCode     = AmlCodeSsdtStandard;
-            cbAmlCodeSsdt = sizeof(AmlCodeSsdtStandard);
-        }
-
-        pabAmlCodeSsdt = (uint8_t *)RTMemAllocZ(cbAmlCodeSsdt);
-        if (pabAmlCodeSsdt)
-        {
-            memcpy(pabAmlCodeSsdt, pabAmlCode, cbAmlCodeSsdt);
-
-            if (fCpuHotPlug)
-                patchAmlCpuHotPlug(pDevIns, pabAmlCodeSsdt, cbAmlCodeSsdt);
-            else
-                patchAml(pDevIns, pabAmlCodeSsdt, cbAmlCodeSsdt);
-        }
-        else
-            rc = VERR_NO_MEMORY;
     }
     else if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed to read \"SsdtFilePath\""));
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to read \"SsdtFilePath\""));
 
     if (RT_SUCCESS(rc))
@@ -452 +431 @@
         *pcbSsdt = cbAmlCodeSsdt;
     }
-
-    return VINF_SUCCESS;
+    return rc;
 }