37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
From 14c4062c4acc7d417d163276b65e59073ba18eeb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Keqian Zhu <zhukeqian1@huawei.com>
|
||
|
|
Date: Tue, 26 Mar 2024 14:51:18 +0800
|
||
|
|
Subject: [PATCH] acpi/cpu: Fix cpu_hotplug_hw_init()
|
||
|
|
|
||
|
|
For the present but disabled vCPUs, they will be released after
|
||
|
|
cpu_hotplug_hw_init(), we should not assign it to AcpiCpuStatus.
|
||
|
|
|
||
|
|
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
|
||
|
|
---
|
||
|
|
hw/acpi/cpu.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
|
||
|
|
index c922c380aa..b258396e01 100644
|
||
|
|
--- a/hw/acpi/cpu.c
|
||
|
|
+++ b/hw/acpi/cpu.c
|
||
|
|
@@ -229,7 +229,6 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,
|
||
|
|
for (i = 0; i < id_list->len; i++) {
|
||
|
|
struct CPUState *cpu = CPU(id_list->cpus[i].cpu);
|
||
|
|
if (qemu_present_cpu(cpu)) {
|
||
|
|
- state->devs[i].cpu = cpu;
|
||
|
|
state->devs[i].is_present = true;
|
||
|
|
} else {
|
||
|
|
if (qemu_persistent_cpu(cpu)) {
|
||
|
|
@@ -240,6 +239,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,
|
||
|
|
}
|
||
|
|
|
||
|
|
if (qemu_enabled_cpu(cpu)) {
|
||
|
|
+ state->devs[i].cpu = cpu;
|
||
|
|
state->devs[i].is_enabled = true;
|
||
|
|
} else {
|
||
|
|
state->devs[i].is_enabled = false;
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|