[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 04/11] dump-guest-memory: add dump_in_progress()
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v7 04/11] dump-guest-memory: add dump_in_progress() helper function |
Date: |
Tue, 16 Feb 2016 15:50:54 +0800 |
For now, it has no effect. It will be used in dump detach support.
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
---
dump.c | 13 +++++++++++++
include/qemu-common.h | 4 ++++
qmp.c | 14 ++++++++++++++
3 files changed, 31 insertions(+)
diff --git a/dump.c b/dump.c
index 434bc60..158d6ea 100644
--- a/dump.c
+++ b/dump.c
@@ -1450,6 +1450,12 @@ static void dump_state_prepare(DumpState *s)
*s = (DumpState) { .status = DUMP_STATUS_ACTIVE };
}
+bool dump_in_progress(void)
+{
+ DumpState *state = &dump_state_global;
+ return (state->status == DUMP_STATUS_ACTIVE);
+}
+
static void dump_init(DumpState *s, int fd, bool has_format,
DumpGuestMemoryFormat format, bool paging, bool
has_filter,
int64_t begin, int64_t length, Error **errp)
@@ -1628,6 +1634,13 @@ void qmp_dump_guest_memory(bool paging, const char *file,
DumpState *s;
Error *local_err = NULL;
+ /* if there is a dump in background, we should wait until the dump
+ * finished */
+ if (dump_in_progress()) {
+ error_setg(errp, "There is a dump in process, please wait.");
+ return;
+ }
+
/*
* kdump-compressed format need the whole memory dumped, so paging or
* filter is not supported here.
diff --git a/include/qemu-common.h b/include/qemu-common.h
index f557be7..59ab759 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -494,4 +494,8 @@ int parse_debug_env(const char *name, int max, int initial);
const char *qemu_ether_ntoa(const MACAddr *mac);
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/qmp.c b/qmp.c
index 6ae7230..f4caf5a 100644
--- a/qmp.c
+++ b/qmp.c
@@ -103,6 +103,13 @@ void qmp_quit(Error **errp)
void qmp_stop(Error **errp)
{
+ /* if there is a dump in background, we should wait until the dump
+ * finished */
+ if (dump_in_progress()) {
+ error_setg(errp, "There is a dump in process, please wait.");
+ return;
+ }
+
if (runstate_check(RUN_STATE_INMIGRATE)) {
autostart = 0;
} else {
@@ -175,6 +182,13 @@ void qmp_cont(Error **errp)
BlockBackend *blk;
BlockDriverState *bs;
+ /* if there is a dump in background, we should wait until the dump
+ * finished */
+ if (dump_in_progress()) {
+ error_setg(errp, "There is a dump in process, please wait.");
+ return;
+ }
+
if (runstate_needs_reset()) {
error_setg(errp, "Resetting the Virtual Machine is required");
return;
--
2.4.3
- [Qemu-devel] [PATCH v7 00/11] Add basic "detach" support for dump-guest-memory, Peter Xu, 2016/02/16
- [Qemu-devel] [PATCH v7 01/11] dump-guest-memory: cleanup: removing dump_{error|cleanup}()., Peter Xu, 2016/02/16
- [Qemu-devel] [PATCH v7 02/11] dump-guest-memory: add "detach" flag for QMP/HMP interfaces., Peter Xu, 2016/02/16
- [Qemu-devel] [PATCH v7 03/11] dump-guest-memory: using static DumpState, add DumpStatus, Peter Xu, 2016/02/16
- [Qemu-devel] [PATCH v7 04/11] dump-guest-memory: add dump_in_progress() helper function,
Peter Xu <=
- [Qemu-devel] [PATCH v7 05/11] dump-guest-memory: introduce dump_process() helper function., Peter Xu, 2016/02/16
- [Qemu-devel] [PATCH v7 06/11] dump-guest-memory: disable dump when in INMIGRATE state, Peter Xu, 2016/02/16
- [Qemu-devel] [PATCH v7 07/11] dump-guest-memory: add "detach" support, Peter Xu, 2016/02/16
- [Qemu-devel] [PATCH v7 08/11] DumpState: adding total_size and written_size fields, Peter Xu, 2016/02/16
- [Qemu-devel] [PATCH v7 09/11] Dump: add qmp command "query-dump", Peter Xu, 2016/02/16
- [Qemu-devel] [PATCH v7 10/11] Dump: add hmp command "info dump", Peter Xu, 2016/02/16