From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: drjones@redhat.com, lersek@redhat.com, armbru@redhat.com,
peterx@redhat.com, lcapitulino@redhat.com, famz@redhat.com,
pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v4 04/11] dump-guest-memory: add dump_in_progress() helper function
Date: Tue, 1 Dec 2015 21:28:43 +0800 [thread overview]
Message-ID: <1448976530-15984-5-git-send-email-peterx@redhat.com> (raw)
In-Reply-To: <1448976530-15984-1-git-send-email-peterx@redhat.com>
For now, it has no effect. It will be used in dump detach support.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
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 f5f3c59..3cf75db 100644
--- a/dump.c
+++ b/dump.c
@@ -1426,6 +1426,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)
@@ -1599,6 +1605,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 405364f..7b74961 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -501,4 +501,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 0a1fa19..055586d 100644
--- a/qmp.c
+++ b/qmp.c
@@ -102,6 +102,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 {
@@ -174,6 +181,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
next prev parent reply other threads:[~2015-12-01 13:29 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-01 13:28 [Qemu-devel] [PATCH v4 00/11] Add basic "detach" support for dump-guest-memory Peter Xu
2015-12-01 13:28 ` [Qemu-devel] [PATCH v4 01/11] dump-guest-memory: cleanup: removing dump_{error|cleanup}() Peter Xu
2015-12-02 0:37 ` Fam Zheng
2015-12-02 2:50 ` Peter Xu
2015-12-01 13:28 ` [Qemu-devel] [PATCH v4 02/11] dump-guest-memory: add "detach" flag for QMP/HMP interfaces Peter Xu
2015-12-01 13:28 ` [Qemu-devel] [PATCH v4 03/11] dump-guest-memory: using static DumpState, add DumpStatus Peter Xu
2015-12-02 0:46 ` Fam Zheng
2015-12-02 3:00 ` Peter Xu
2015-12-01 13:28 ` Peter Xu [this message]
2015-12-01 13:28 ` [Qemu-devel] [PATCH v4 05/11] dump-guest-memory: introduce dump_process() helper function Peter Xu
2015-12-02 0:50 ` Fam Zheng
2015-12-01 13:28 ` [Qemu-devel] [PATCH v4 06/11] dump-guest-memory: disable dump when in INMIGRATE state Peter Xu
2015-12-02 0:50 ` Fam Zheng
2015-12-02 6:50 ` Peter Xu
2015-12-01 13:28 ` [Qemu-devel] [PATCH v4 07/11] dump-guest-memory: add "detach" support Peter Xu
2015-12-01 13:28 ` [Qemu-devel] [PATCH v4 08/11] dump-guest-memory: add qmp event DUMP_COMPLETED Peter Xu
2015-12-02 1:11 ` Fam Zheng
2015-12-02 8:20 ` Peter Xu
2015-12-02 9:57 ` Fam Zheng
2015-12-02 14:45 ` Eric Blake
2015-12-02 15:21 ` Peter Xu
2015-12-02 16:01 ` Eric Blake
2015-12-03 1:28 ` Peter Xu
2015-12-01 13:28 ` [Qemu-devel] [PATCH v4 09/11] DumpState: adding total_size and written_size fields Peter Xu
2015-12-02 1:32 ` Fam Zheng
2015-12-02 8:49 ` Peter Xu
2015-12-02 9:49 ` Fam Zheng
2015-12-02 10:41 ` Peter Xu
2015-12-02 12:51 ` Fam Zheng
2015-12-02 14:14 ` Peter Xu
2015-12-01 13:28 ` [Qemu-devel] [PATCH v4 10/11] Dump: add qmp command "query-dump" Peter Xu
2015-12-01 13:28 ` [Qemu-devel] [PATCH v4 11/11] Dump: add hmp command "info dump" Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448976530-15984-5-git-send-email-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=armbru@redhat.com \
--cc=drjones@redhat.com \
--cc=famz@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=lersek@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).