qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 v5 04/11] dump-guest-memory: add dump_in_progress() helper function
Date: Mon,  7 Dec 2015 13:56:29 +0800	[thread overview]
Message-ID: <1449467796-15856-5-git-send-email-peterx@redhat.com> (raw)
In-Reply-To: <1449467796-15856-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 b48cec2..ccd56c8 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

  parent reply	other threads:[~2015-12-07  5:57 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-07  5:56 [Qemu-devel] [PATCH v5 00/11] Add basic "detach" support for dump-guest-memory Peter Xu
2015-12-07  5:56 ` [Qemu-devel] [PATCH v5 01/11] dump-guest-memory: cleanup: removing dump_{error|cleanup}() Peter Xu
2015-12-07  5:56 ` [Qemu-devel] [PATCH v5 02/11] dump-guest-memory: add "detach" flag for QMP/HMP interfaces Peter Xu
2015-12-07  5:56 ` [Qemu-devel] [PATCH v5 03/11] dump-guest-memory: using static DumpState, add DumpStatus Peter Xu
2015-12-07  5:56 ` Peter Xu [this message]
2015-12-07  5:56 ` [Qemu-devel] [PATCH v5 05/11] dump-guest-memory: introduce dump_process() helper function Peter Xu
2015-12-07  5:56 ` [Qemu-devel] [PATCH v5 06/11] dump-guest-memory: disable dump when in INMIGRATE state Peter Xu
2015-12-07  6:14   ` Fam Zheng
2015-12-07  7:01     ` Peter Xu
2015-12-07  5:56 ` [Qemu-devel] [PATCH v5 07/11] dump-guest-memory: add "detach" support Peter Xu
2015-12-07  5:56 ` [Qemu-devel] [PATCH v5 08/11] dump-guest-memory: add qmp event DUMP_COMPLETED Peter Xu
2015-12-07  5:56 ` [Qemu-devel] [PATCH v5 09/11] DumpState: adding total_size and written_size fields Peter Xu
2015-12-07  5:56 ` [Qemu-devel] [PATCH v5 10/11] Dump: add qmp command "query-dump" Peter Xu
2015-12-07  6:21   ` Fam Zheng
2015-12-07  7:03     ` Peter Xu
2015-12-07  5:56 ` [Qemu-devel] [PATCH v5 11/11] Dump: add hmp command "info dump" Peter Xu
2015-12-07  6:23 ` [Qemu-devel] [PATCH v5 00/11] Add basic "detach" support for dump-guest-memory Fam Zheng
2015-12-07 22:13 ` Eric Blake
2015-12-08  2:26   ` 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=1449467796-15856-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).