mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include: move dump_in_progress() to runstate.h

Browse Source 
Along with other state tracking functions. Rename it for consistency.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20220323155743.1585078-21-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-03-23 19:57:31 +04:00 committed by Paolo Bonzini
parent c097f1e603
commit 544803c7a1
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dump/dump.c
View File

@ -1564,7 +1564,7 @@ static void dump_state_prepare(DumpState *s)
*s = (DumpState) { .status = DUMP_STATUS_ACTIVE }; *s = (DumpState) { .status = DUMP_STATUS_ACTIVE };
} }
bool dump_in_progress(void) bool qemu_system_dump_in_progress(void)
{ {
DumpState *state = &dump_state_global; DumpState *state = &dump_state_global;
return (qatomic_read(&state->status) == DUMP_STATUS_ACTIVE); 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 /* if there is a dump in background, we should wait until the dump
* finished */ * finished */
if (dump_in_progress()) { if (qemu_system_dump_in_progress()) {
error_setg(errp, "There is a dump in process, please wait."); error_setg(errp, "There is a dump in process, please wait.");
return; return;
} }

4
include/qemu-common.h
View File

@ -76,8 +76,4 @@ int parse_debug_env(const char *name, int max, int initial);
void page_size_init(void); void page_size_init(void);
/* returns non-zero if dump is in progress, otherwise zero is
* returned. */
bool dump_in_progress(void);
#endif #endif

1
include/sysemu/runstate.h
View File

@ -69,6 +69,7 @@ void qemu_system_killed(int signal, pid_t pid);
void qemu_system_reset(ShutdownCause reason); void qemu_system_reset(ShutdownCause reason);
void qemu_system_guest_panicked(GuestPanicInformation *info); void qemu_system_guest_panicked(GuestPanicInformation *info);
void qemu_system_guest_crashloaded(GuestPanicInformation *info); void qemu_system_guest_crashloaded(GuestPanicInformation *info);
bool qemu_system_dump_in_progress(void);
#endif #endif

4
monitor/qmp-cmds.c
View File

@ -85,7 +85,7 @@ void qmp_stop(Error **errp)
{ {
/* if there is a dump in background, we should wait until the dump /* if there is a dump in background, we should wait until the dump
* finished */ * finished */
if (dump_in_progress()) { if (qemu_system_dump_in_progress()) {
error_setg(errp, "There is a dump in process, please wait."); error_setg(errp, "There is a dump in process, please wait.");
return; return;
} }
@ -115,7 +115,7 @@ void qmp_cont(Error **errp)
/* if there is a dump in background, we should wait until the dump /* if there is a dump in background, we should wait until the dump
* finished */ * finished */
if (dump_in_progress()) { if (qemu_system_dump_in_progress()) {
error_setg(errp, "There is a dump in process, please wait."); error_setg(errp, "There is a dump in process, please wait.");
return; return;
} }