From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3Mhy-00086q-Kt for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:33:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3Mht-0004Py-FH for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:33:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53807) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3Mht-0004Ps-AV for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:33:21 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 1504AC0A15FF for ; Mon, 30 Nov 2015 11:33:21 +0000 (UTC) From: Peter Xu Date: Mon, 30 Nov 2015 19:32:12 +0800 Message-Id: <1448883140-20249-5-git-send-email-peterx@redhat.com> In-Reply-To: <1448883140-20249-1-git-send-email-peterx@redhat.com> References: <1448883140-20249-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v3 04/12] dump-guest-memory: add dump_in_progress() helper function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 For now, it has no effect. It will be used in dump detach support. Signed-off-by: Peter Xu --- 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 c9ea878..110dbf9 100644 --- a/dump.c +++ b/dump.c @@ -1436,6 +1436,12 @@ static DumpState *dump_state_get_global(void) return &state; } +bool dump_in_progress(void) +{ + DumpState *state = dump_state_get_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) @@ -1609,6 +1615,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