44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
|
From a29922f76c9b5064ddd2e686fa725b96c435e889 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Keqian Zhu <zhukeqian1@huawei.com>
|
||
|
|
Date: Sun, 17 Mar 2024 16:37:04 +0800
|
||
|
|
Subject: [PATCH] system/cpus: Fix resume_all_vcpus() under vCPU hotplug
|
||
|
|
condition
|
||
|
|
|
||
|
|
For vCPU being hotplugged, qemu_init_vcpu() is called. In this
|
||
|
|
function, we set vcpu state as stopped, and then wait vcpu thread
|
||
|
|
to be created.
|
||
|
|
|
||
|
|
As the vcpu state is stopped, it will inform us it has been created
|
||
|
|
and then wait on halt_cond. After we has realized vcpu object, we
|
||
|
|
will resume the vcpu thread.
|
||
|
|
|
||
|
|
However, during we wait vcpu thread to be created, the bql is
|
||
|
|
unlocked, and other thread is allowed to call resume_all_vcpus(),
|
||
|
|
which will resume the un-realized vcpu.
|
||
|
|
|
||
|
|
This fixes the issue by filter out un-realized vcpu during
|
||
|
|
resume_all_vcpus().
|
||
|
|
|
||
|
|
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
|
||
|
|
---
|
||
|
|
system/cpus.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/system/cpus.c b/system/cpus.c
|
||
|
|
index 7c5369fa9c..f2289e9545 100644
|
||
|
|
--- a/system/cpus.c
|
||
|
|
+++ b/system/cpus.c
|
||
|
|
@@ -618,6 +618,9 @@ void resume_all_vcpus(void)
|
||
|
|
|
||
|
|
qemu_clock_enable(QEMU_CLOCK_VIRTUAL, true);
|
||
|
|
CPU_FOREACH(cpu) {
|
||
|
|
+ if (!object_property_get_bool(OBJECT(cpu), "realized", &error_abort)) {
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
cpu_resume(cpu);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|