From 544803c7a19bd2359ee3a0b3607ead71bf1f9394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 23 Mar 2022 19:57:31 +0400 Subject: include: move dump_in_progress() to runstate.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Along with other state tracking functions. Rename it for consistency. Signed-off-by: Marc-André Lureau Message-Id: <20220323155743.1585078-21-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- dump/dump.c | 4 ++-- include/qemu-common.h | 4 ---- include/sysemu/runstate.h | 1 + monitor/qmp-cmds.c | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dump/dump.c b/dump/dump.c index f57ed76fa7..5d71c47d06 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -1564,7 +1564,7 @@ static void dump_state_prepare(DumpState *s) *s = (DumpState) { .status = DUMP_STATUS_ACTIVE }; } -bool dump_in_progress(void) +bool qemu_system_dump_in_progress(void) { DumpState *state = &dump_state_global; return (qatomic_read(&state->status) == DUMP_STATUS_ACTIVE); @@ -1930,7 +1930,7 @@ void qmp_dump_guest_memory(bool paging, const char *file, /* if there is a dump in background, we should wait until the dump * finished */ - if (dump_in_progress()) { + if (qemu_system_dump_in_progress()) { error_setg(errp, "There is a dump in process, please wait."); return; } diff --git a/include/qemu-common.h b/include/qemu-common.h index fdb0b16166..5f53a0e112 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -76,8 +76,4 @@ int parse_debug_env(const char *name, int max, int initial); void page_size_init(void); -/* returns non-zero if dump is in progress, otherwise zero is - * returned. */ -bool dump_in_progress(void); - #endif diff --git a/include/sysemu/runstate.h b/include/sysemu/runstate.h index a535691573..c3f445dd26 100644 --- a/include/sysemu/runstate.h +++ b/include/sysemu/runstate.h @@ -69,6 +69,7 @@ void qemu_system_killed(int signal, pid_t pid); void qemu_system_reset(ShutdownCause reason); void qemu_system_guest_panicked(GuestPanicInformation *info); void qemu_system_guest_crashloaded(GuestPanicInformation *info); +bool qemu_system_dump_in_progress(void); #endif diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 0b04855ce8..883cf1ca4b 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -85,7 +85,7 @@ void qmp_stop(Error **errp) { /* if there is a dump in background, we should wait until the dump * finished */ - if (dump_in_progress()) { + if (qemu_system_dump_in_progress()) { error_setg(errp, "There is a dump in process, please wait."); return; } @@ -115,7 +115,7 @@ void qmp_cont(Error **errp) /* if there is a dump in background, we should wait until the dump * finished */ - if (dump_in_progress()) { + if (qemu_system_dump_in_progress()) { error_setg(errp, "There is a dump in process, please wait."); return; } -- cgit v1.2.3