From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3Mhk-0007k1-NZ for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:33:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3Mhi-0004NG-Bi for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:33:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50607) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3Mhi-0004N6-20 for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:33:10 -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 C6139C0D223E for ; Mon, 30 Nov 2015 11:33:09 +0000 (UTC) From: Peter Xu Date: Mon, 30 Nov 2015 19:32:11 +0800 Message-Id: <1448883140-20249-4-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 03/12] dump-guest-memory: using static DumpState, add DumpStatus 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 Instead of malloc/free each time for DumpState, make it static. Added DumpStatus to show status for dump. This is to be used for detach dump. Signed-off-by: Peter Xu --- dump.c | 30 +++++++++++++++++++++++++++--- include/sysemu/dump.h | 2 ++ qapi-schema.json | 18 ++++++++++++++++++ 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dump.c b/dump.c index d79e0ed..c9ea878 100644 --- a/dump.c +++ b/dump.c @@ -1418,6 +1418,24 @@ static void get_max_mapnr(DumpState *s) s->max_mapnr = paddr_to_pfn(last_block->target_end); } +/* init dump state with specific status */ +static void dump_state_prepare(DumpState *s, DumpStatus status) +{ + bzero(s, sizeof(*s)); + s->status = status; +} + +static DumpState *dump_state_get_global(void) +{ + static DumpState state; + static bool init = false; + if (!init) { + dump_state_prepare(&state, DUMP_STATUS_NONE); + init = true; + } + return &state; +} + 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) @@ -1647,13 +1665,14 @@ void qmp_dump_guest_memory(bool paging, const char *file, return; } - s = g_malloc0(sizeof(DumpState)); + s = dump_state_get_global(); + dump_state_prepare(s, DUMP_STATUS_ACTIVE); dump_init(s, fd, has_format, format, paging, has_begin, begin, length, &local_err); if (local_err) { - g_free(s); error_propagate(errp, local_err); + s->status = DUMP_STATUS_FAILED; return; } @@ -1663,8 +1682,13 @@ void qmp_dump_guest_memory(bool paging, const char *file, create_vmcore(s, errp); } + if (*errp) { + s->status = DUMP_STATUS_FAILED; + } else { + s->status = DUMP_STATUS_COMPLETED; + } + dump_cleanup(s); - g_free(s); } DumpGuestMemoryCapability *qmp_query_dump_guest_memory_capability(Error **errp) diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h index 7e4ec5c..affef38 100644 --- a/include/sysemu/dump.h +++ b/include/sysemu/dump.h @@ -45,6 +45,7 @@ #include "sysemu/dump-arch.h" #include "sysemu/memory_mapping.h" +#include "qapi-types.h" typedef struct QEMU_PACKED MakedumpfileHeader { char signature[16]; /* = "makedumpfile" */ @@ -183,6 +184,7 @@ typedef struct DumpState { off_t offset_page; /* offset of page part in vmcore */ size_t num_dumpable; /* number of page that can be dumped */ uint32_t flag_compress; /* indicate the compression format */ + DumpStatus status; /* current dump status */ } DumpState; uint16_t cpu_to_dump16(DumpState *s, uint16_t val); diff --git a/qapi-schema.json b/qapi-schema.json index fd81ce2..3728bfc 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2139,6 +2139,24 @@ '*format': 'DumpGuestMemoryFormat'} } ## +# @DumpStatus +# +# Define the status for dump guest memory. +# +# @none: not started any dump-guest-memory yet. +# +# @active: there is one dump running in background. +# +# @completed: the last dump has finished sucessfully +# +# @failed: the last dump has failed. +# +# Since 2.6 +## +{ 'enum': 'DumpStatus', + 'data': [ 'none', 'active', 'completed', 'failed' ] } + +## # @DumpGuestMemoryCapability: # # A list of the available formats for dump-guest-memory -- 2.4.3