38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
From 576a2a88625978f1befde11f0823f32bbc54cad1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Salil Mehta <salil.mehta@huawei.com>
|
||
|
|
Date: Mon, 28 Aug 2023 20:00:08 +0000
|
||
|
|
Subject: [PATCH] hw/acpi: Use qemu_present_cpu() API in ACPI CPU hotplug init
|
||
|
|
|
||
|
|
ACPI CPU Hotplug code assumes a virtual CPU is unplugged if the CPUState object
|
||
|
|
is absent in the list of ths possible CPUs(CPUArchIdList *possible_cpus)
|
||
|
|
maintained on per-machine basis. Use the earlier introduced qemu_present_cpu()
|
||
|
|
API to check this state.
|
||
|
|
|
||
|
|
This change should have no bearing on the functionality of any architecture and
|
||
|
|
is mere a representational change.
|
||
|
|
|
||
|
|
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
|
||
|
|
---
|
||
|
|
hw/acpi/cpu.c | 5 ++++-
|
||
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
|
||
|
|
index 4b24a25003..cabeb4e86b 100644
|
||
|
|
--- a/hw/acpi/cpu.c
|
||
|
|
+++ b/hw/acpi/cpu.c
|
||
|
|
@@ -226,7 +226,10 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,
|
||
|
|
state->dev_count = id_list->len;
|
||
|
|
state->devs = g_new0(typeof(*state->devs), state->dev_count);
|
||
|
|
for (i = 0; i < id_list->len; i++) {
|
||
|
|
- state->devs[i].cpu = CPU(id_list->cpus[i].cpu);
|
||
|
|
+ struct CPUState *cpu = CPU(id_list->cpus[i].cpu);
|
||
|
|
+ if (qemu_present_cpu(cpu)) {
|
||
|
|
+ state->devs[i].cpu = cpu;
|
||
|
|
+ }
|
||
|
|
state->devs[i].arch_id = id_list->cpus[i].arch_id;
|
||
|
|
}
|
||
|
|
memory_region_init_io(&state->ctrl_reg, owner, &cpu_hotplug_ops, state,
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|