Stopping a vCPU is not a simple state transition: an asynchronous request (CPUState::stop flag) is acknowledged (CPUState::stopped flag). Use a better name to clarify.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- system/cpus.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/system/cpus.c b/system/cpus.c index 1a6fd286a81..f69558c760c 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -382,7 +382,8 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data) do_run_on_cpu(cpu, func, data, &bql); } -static void qemu_cpu_stop(CPUState *cpu, bool exit) +/* Must be called by the owning thread */ +static void qemu_cpu_ack_stop_request(CPUState *cpu, bool exit) { g_assert(qemu_cpu_is_self(cpu)); cpu->stop = false; @@ -397,7 +398,7 @@ void qemu_process_cpu_events_common(CPUState *cpu) { qatomic_set_mb(&cpu->thread_kicked, false); if (cpu->stop) { - qemu_cpu_stop(cpu, false); + qemu_cpu_ack_stop_request(cpu, false); } process_queued_cpu_work(cpu); } @@ -555,7 +556,7 @@ void cpu_thread_signal_destroyed(CPUState *cpu) void cpu_pause(CPUState *cpu) { if (qemu_cpu_is_self(cpu)) { - qemu_cpu_stop(cpu, true); + qemu_cpu_ack_stop_request(cpu, true); } else { cpu->stop = true; cpu_exit(cpu); -- 2.53.0
