39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
|
From 0bee56446962676992d11e5879f6fbac57e785e8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Keqian Zhu <zhukeqian1@huawei.com>
|
||
|
|
Date: Tue, 26 Mar 2024 23:38:31 +0800
|
||
|
|
Subject: [PATCH] arm/virt-acpi: Require possible_cpu_arch_ids for
|
||
|
|
build_cpus_aml()
|
||
|
|
|
||
|
|
As the acpi_dev requires possible_cpu_arch_ids to support
|
||
|
|
vcpu hotplug.
|
||
|
|
|
||
|
|
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
|
||
|
|
---
|
||
|
|
hw/arm/virt-acpi-build.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
|
||
|
|
index 590afcfa98..46642efac4 100644
|
||
|
|
--- a/hw/arm/virt-acpi-build.c
|
||
|
|
+++ b/hw/arm/virt-acpi-build.c
|
||
|
|
@@ -1003,6 +1003,7 @@ static void
|
||
|
|
build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
|
||
|
|
{
|
||
|
|
VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
|
||
|
|
+ MachineClass *mc = MACHINE_GET_CLASS(vms);
|
||
|
|
Aml *scope, *dsdt;
|
||
|
|
MachineState *ms = MACHINE(vms);
|
||
|
|
const MemMapEntry *memmap = vms->memmap;
|
||
|
|
@@ -1020,7 +1021,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
|
||
|
|
*/
|
||
|
|
scope = aml_scope("\\_SB");
|
||
|
|
/* if GED is enabled then cpus AML shall be added as part build_cpus_aml */
|
||
|
|
- if (vms->acpi_dev) {
|
||
|
|
+ if (mc->has_hotpluggable_cpus) {
|
||
|
|
CPUHotplugFeatures opts = {
|
||
|
|
.acpi_1_compatible = false,
|
||
|
|
.has_legacy_cphp = false
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|