Changeset 25817 in vbox for trunk/src/VBox/Devices/PC/ACPI

Timestamp:

Jan 13, 2010 10:08:17 PM (15 years ago)

Author:

vboxsync

Message:

CPU hotplug: Merge the second patch. ACPI changes to support CPU hotplugging. ACPI table changes are in a separate file which is used if CPU hotplugging is enabled for a VM to not break untested guests

File:

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

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

@@ -29 +29 @@
 #include <VBox/log.h>
 #include <VBox/param.h>
+#include <VBox/cfgm.h>
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
@@ -39 +40 @@
 /* Statically compiled AML */
 # include <vboxaml.hex>
+# include <vboxaml-cpuhotplug.hex>
 #endif
 
@@ -140 +142 @@
     return prepareDynamicDsdt(pDevIns, ppPtr, puDsdtLen);
 #else
-    patchAml(pDevIns, AmlCode, sizeof(AmlCode));
-    *ppPtr = AmlCode;
-    *puDsdtLen = sizeof(AmlCode);
+    unsigned char *pbAmlCode = NULL;
+    size_t cbAmlCode = 0;
+    bool fCpuHotplug = false;
+    int rc = CFGMR3QueryBoolDef(pDevIns->pCfgHandle, "CpuHotplug", &fCpuHotplug, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"CpuHotplug\""));
+
+    if (fCpuHotplug)
+    {
+        pbAmlCode = AmlCodeCpuHotplug;
+        cbAmlCode = sizeof(AmlCodeCpuHotplug);
+    }
+    else
+    {
+        pbAmlCode = AmlCode;
+        cbAmlCode = sizeof(AmlCode);
+    }
+
+    patchAml(pDevIns, pbAmlCode, cbAmlCode);
+    *ppPtr = pbAmlCode;
+    *puDsdtLen = cbAmlCode;
     return 0;
 #endif