|
 |
5d360b |
From 7924dd9493c5b90bb1a10b3b9ec486fa10d87304 Mon Sep 17 00:00:00 2001
|
|
|
5d360b |
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
|
5d360b |
Date: Wed, 13 Dec 2017 13:38:55 +0100
|
|
|
5d360b |
Subject: [PATCH 24/41] dump-guest-memory: using static DumpState, add
|
|
|
5d360b |
DumpStatus
|
|
|
5d360b |
MIME-Version: 1.0
|
|
|
5d360b |
Content-Type: text/plain; charset=UTF-8
|
|
|
5d360b |
Content-Transfer-Encoding: 8bit
|
|
|
5d360b |
|
|
|
5d360b |
RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
5d360b |
Message-id: <20171213133912.26176-25-marcandre.lureau@redhat.com>
|
|
|
5d360b |
Patchwork-id: 78373
|
|
|
5d360b |
O-Subject: [RHEL-7.5 qemu-kvm PATCH v3 24/41] dump-guest-memory: using static DumpState, add DumpStatus
|
|
|
5d360b |
Bugzilla: 1411490
|
|
|
5d360b |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
5d360b |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
5d360b |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
5d360b |
|
|
|
5d360b |
From: Peter Xu <peterx@redhat.com>
|
|
|
5d360b |
|
|
|
5d360b |
Instead of malloc/free each time for DumpState, make it
|
|
|
5d360b |
static. Added DumpStatus to show status for dump.
|
|
|
5d360b |
|
|
|
5d360b |
This is to be used for detached dump.
|
|
|
5d360b |
|
|
|
5d360b |
Signed-off-by: Peter Xu <peterx@redhat.com>
|
|
|
5d360b |
Reviewed-by: Fam Zheng <famz@redhat.com>
|
|
|
5d360b |
Message-Id: <1455772616-8668-4-git-send-email-peterx@redhat.com>
|
|
|
5d360b |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
5d360b |
|
|
|
5d360b |
(cherry picked from commit baf28f57e2dec63eebfcd3c00f8d4dea9fcde21e)
|
|
|
5d360b |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
5d360b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
5d360b |
---
|
|
|
5d360b |
dump.c | 21 ++++++++++++++++-----
|
|
|
5d360b |
include/sysemu/dump.h | 2 ++
|
|
|
5d360b |
qapi-schema.json | 18 ++++++++++++++++++
|
|
|
5d360b |
3 files changed, 36 insertions(+), 5 deletions(-)
|
|
|
5d360b |
|
|
|
5d360b |
diff --git a/dump.c b/dump.c
|
|
|
5d360b |
index 790bfe4..254c0ba 100644
|
|
|
5d360b |
--- a/dump.c
|
|
|
5d360b |
+++ b/dump.c
|
|
|
5d360b |
@@ -1447,6 +1447,14 @@ static void get_max_mapnr(DumpState *s)
|
|
|
5d360b |
s->max_mapnr = dump_paddr_to_pfn(s, last_block->target_end);
|
|
|
5d360b |
}
|
|
|
5d360b |
|
|
|
5d360b |
+static DumpState dump_state_global = { .status = DUMP_STATUS_NONE };
|
|
|
5d360b |
+
|
|
|
5d360b |
+static void dump_state_prepare(DumpState *s)
|
|
|
5d360b |
+{
|
|
|
5d360b |
+ /* zero the struct, setting status to active */
|
|
|
5d360b |
+ *s = (DumpState) { .status = DUMP_STATUS_ACTIVE };
|
|
|
5d360b |
+}
|
|
|
5d360b |
+
|
|
|
5d360b |
static void dump_init(DumpState *s, int fd, bool has_format,
|
|
|
5d360b |
DumpGuestMemoryFormat format, bool paging, bool has_filter,
|
|
|
5d360b |
int64_t begin, int64_t length, Error **errp)
|
|
|
5d360b |
@@ -1680,24 +1688,27 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin,
|
|
|
5d360b |
return;
|
|
|
5d360b |
}
|
|
|
5d360b |
|
|
|
5d360b |
- s = g_malloc0(sizeof(DumpState));
|
|
|
5d360b |
+ s = &dump_state_global;
|
|
|
5d360b |
+ dump_state_prepare(s);
|
|
|
5d360b |
|
|
|
5d360b |
dump_init(s, fd, has_format, format, paging, has_begin,
|
|
|
5d360b |
begin, length, &local_err);
|
|
|
5d360b |
if (local_err) {
|
|
|
5d360b |
- g_free(s);
|
|
|
5d360b |
error_propagate(errp, local_err);
|
|
|
5d360b |
+ s->status = DUMP_STATUS_FAILED;
|
|
|
5d360b |
return;
|
|
|
5d360b |
}
|
|
|
5d360b |
|
|
|
5d360b |
if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
|
|
|
5d360b |
- create_kdump_vmcore(s, errp);
|
|
|
5d360b |
+ create_kdump_vmcore(s, &local_err);
|
|
|
5d360b |
} else {
|
|
|
5d360b |
- create_vmcore(s, errp);
|
|
|
5d360b |
+ create_vmcore(s, &local_err);
|
|
|
5d360b |
}
|
|
|
5d360b |
|
|
|
5d360b |
+ s->status = (local_err ? DUMP_STATUS_FAILED : DUMP_STATUS_COMPLETED);
|
|
|
5d360b |
+ error_propagate(errp, local_err);
|
|
|
5d360b |
+
|
|
|
5d360b |
dump_cleanup(s);
|
|
|
5d360b |
- g_free(s);
|
|
|
5d360b |
}
|
|
|
5d360b |
|
|
|
5d360b |
DumpGuestMemoryCapability *qmp_query_dump_guest_memory_capability(Error **errp)
|
|
|
5d360b |
diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h
|
|
|
5d360b |
index 2f04b24..21fc02d 100644
|
|
|
5d360b |
--- a/include/sysemu/dump.h
|
|
|
5d360b |
+++ b/include/sysemu/dump.h
|
|
|
5d360b |
@@ -38,6 +38,7 @@
|
|
|
5d360b |
|
|
|
5d360b |
#include "sysemu/dump-arch.h"
|
|
|
5d360b |
#include "sysemu/memory_mapping.h"
|
|
|
5d360b |
+#include "qapi-types.h"
|
|
|
5d360b |
|
|
|
5d360b |
typedef struct QEMU_PACKED MakedumpfileHeader {
|
|
|
5d360b |
char signature[16]; /* = "makedumpfile" */
|
|
|
5d360b |
@@ -176,6 +177,7 @@ typedef struct DumpState {
|
|
|
5d360b |
off_t offset_page; /* offset of page part in vmcore */
|
|
|
5d360b |
size_t num_dumpable; /* number of page that can be dumped */
|
|
|
5d360b |
uint32_t flag_compress; /* indicate the compression format */
|
|
|
5d360b |
+ DumpStatus status; /* current dump status */
|
|
|
5d360b |
} DumpState;
|
|
|
5d360b |
|
|
|
5d360b |
uint16_t cpu_to_dump16(DumpState *s, uint16_t val);
|
|
|
5d360b |
diff --git a/qapi-schema.json b/qapi-schema.json
|
|
|
5d360b |
index 5138ed9..7988ae5 100644
|
|
|
5d360b |
--- a/qapi-schema.json
|
|
|
5d360b |
+++ b/qapi-schema.json
|
|
|
5d360b |
@@ -2646,6 +2646,24 @@
|
|
|
5d360b |
'*length': 'int', '*format': 'DumpGuestMemoryFormat' } }
|
|
|
5d360b |
|
|
|
5d360b |
##
|
|
|
5d360b |
+# @DumpStatus
|
|
|
5d360b |
+#
|
|
|
5d360b |
+# Describe the status of a long-running background guest memory dump.
|
|
|
5d360b |
+#
|
|
|
5d360b |
+# @none: no dump-guest-memory has started yet.
|
|
|
5d360b |
+#
|
|
|
5d360b |
+# @active: there is one dump running in background.
|
|
|
5d360b |
+#
|
|
|
5d360b |
+# @completed: the last dump has finished successfully.
|
|
|
5d360b |
+#
|
|
|
5d360b |
+# @failed: the last dump has failed.
|
|
|
5d360b |
+#
|
|
|
5d360b |
+# Since 2.6
|
|
|
5d360b |
+##
|
|
|
5d360b |
+{ 'enum': 'DumpStatus',
|
|
|
5d360b |
+ 'data': [ 'none', 'active', 'completed', 'failed' ] }
|
|
|
5d360b |
+
|
|
|
5d360b |
+##
|
|
|
5d360b |
# @DumpGuestMemoryCapability:
|
|
|
5d360b |
#
|
|
|
5d360b |
# A list of the available formats for dump-guest-memory
|
|
|
5d360b |
--
|
|
|
5d360b |
1.8.3.1
|
|
|
5d360b |
|