From patchwork Mon Dec 7 05:56:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 553271 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D4BF4140313 for ; Mon, 7 Dec 2015 16:58:58 +1100 (AEDT) Received: from localhost ([::1]:52668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a5op6-0006xi-Of for incoming@patchwork.ozlabs.org; Mon, 07 Dec 2015 00:58:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a5onK-0002zB-Jg for qemu-devel@nongnu.org; Mon, 07 Dec 2015 00:57:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a5onJ-0005aq-JQ for qemu-devel@nongnu.org; Mon, 07 Dec 2015 00:57:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a5onJ-0005ad-Cc for qemu-devel@nongnu.org; Mon, 07 Dec 2015 00:57:05 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 0DF0D42E5BD for ; Mon, 7 Dec 2015 05:57:05 +0000 (UTC) Received: from pxdev.xzpeter.org.com (vpn1-5-149.pek2.redhat.com [10.72.5.149]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tB75ufDn026455; Mon, 7 Dec 2015 00:56:59 -0500 From: Peter Xu To: qemu-devel@nongnu.org Date: Mon, 7 Dec 2015 13:56:28 +0800 Message-Id: <1449467796-15856-4-git-send-email-peterx@redhat.com> In-Reply-To: <1449467796-15856-1-git-send-email-peterx@redhat.com> References: <1449467796-15856-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 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 03/11] dump-guest-memory: using static DumpState, add DumpStatus X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Instead of malloc/free each time for DumpState, make it static. Added DumpStatus to show status for dump. This is to be used for detached dump. Signed-off-by: Peter Xu --- dump.c | 21 ++++++++++++++++----- include/sysemu/dump.h | 2 ++ qapi-schema.json | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dump.c b/dump.c index d79e0ed..b48cec2 100644 --- a/dump.c +++ b/dump.c @@ -1418,6 +1418,14 @@ static void get_max_mapnr(DumpState *s) s->max_mapnr = paddr_to_pfn(last_block->target_end); } +static DumpState dump_state_global = { .status = DUMP_STATUS_NONE }; + +static void dump_state_prepare(DumpState *s) +{ + /* zero the struct, setting status to active */ + *s = (DumpState) { .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) @@ -1647,24 +1655,27 @@ void qmp_dump_guest_memory(bool paging, const char *file, return; } - s = g_malloc0(sizeof(DumpState)); + s = &dump_state_global; + dump_state_prepare(s); 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; } if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) { - create_kdump_vmcore(s, errp); + create_kdump_vmcore(s, &local_err); } else { - create_vmcore(s, errp); + create_vmcore(s, &local_err); } + s->status = (local_err ? DUMP_STATUS_FAILED : DUMP_STATUS_COMPLETED); + error_propagate(errp, local_err); + 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 97c3ac4..691a130 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2139,6 +2139,24 @@ '*format': 'DumpGuestMemoryFormat'} } ## +# @DumpStatus +# +# Describe the status of a long-running background guest memory dump. +# +# @none: no dump-guest-memory has started yet. +# +# @active: there is one dump running in background. +# +# @completed: the last dump has finished successfully. +# +# @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