There is a single method with ending with _current() suffix. Align with qemu_cpu_kick_self() and pthread conventions by renaming cpu_stop_current() -> qemu_cpu_stop_self() for consistency.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/system/cpus.h | 8 +++++++- hw/ppc/spapr_rtas.c | 2 +- system/cpus.c | 2 +- system/runstate.c | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/system/cpus.h b/include/system/cpus.h index ade13e068eb..2365c7c4597 100644 --- a/include/system/cpus.h +++ b/include/system/cpus.h @@ -28,7 +28,13 @@ bool qemu_in_vcpu_thread(void); void qemu_init_cpu_loop(void); void resume_all_vcpus(void); void pause_all_vcpus(void); -void cpu_stop_current(void); + +/** + * qemu_cpu_stop_self - Stop execution of the current vCPU + * + * Note: No effect if not executing within a vCPU thread. + */ +void qemu_cpu_stop_self(void); /** * qemu_cpu_kick_self - Force vCPU to re-enter to its inner main loop diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 328fc27c400..80cd4246af8 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -93,7 +93,7 @@ static void rtas_power_off(PowerPCCPU *cpu, SpaprMachineState *spapr, return; } qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); - cpu_stop_current(); + qemu_cpu_stop_self(); rtas_st(rets, 0, RTAS_OUT_SUCCESS); } diff --git a/system/cpus.c b/system/cpus.c index f37e215c586..1a6fd286a81 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -674,7 +674,7 @@ void qemu_init_vcpu(CPUState *cpu) } } -void cpu_stop_current(void) +void qemu_cpu_stop_self(void) { if (current_cpu) { current_cpu->stop = true; diff --git a/system/runstate.c b/system/runstate.c index d3e64d2b625..1302fea9ccd 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -472,7 +472,7 @@ int vm_stop(RunState state) * FIXME: should not return to device code in case * vm_stop() has been requested. */ - cpu_stop_current(); + qemu_cpu_stop_self(); return 0; } @@ -900,7 +900,7 @@ void qemu_system_reset_request(ShutdownCause reason) } else { reset_requested = reason; } - cpu_stop_current(); + qemu_cpu_stop_self(); qemu_notify_event(); } @@ -918,7 +918,7 @@ void qemu_system_suspend_request(void) return; } suspend_requested = 1; - cpu_stop_current(); + qemu_cpu_stop_self(); qemu_notify_event(); } -- 2.53.0
