No functional change. Cleanup only.
Signed-off-by: Peter Xu <pet...@redhat.com>
Reviewed-by: Fam Zheng <f...@redhat.com>
---
dump.c | 31 +++++++++++++++++++++----------
include/sysemu/dump.h | 3 +++
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/dump.c b/dump.c
index ccd56c8..f0ee9a8 100644
--- a/dump.c
+++ b/dump.c
@@ -1441,6 +1441,9 @@ static void dump_init(DumpState *s, int fd, bool
has_format,
Error *err = NULL;
int ret;
+ s->has_format = has_format;
+ s->format = format;
+
/* kdump-compressed is conflict with paging and filter */
if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
assert(!paging && !has_filter);
@@ -1594,6 +1597,23 @@ cleanup:
dump_cleanup(s);
}
+/* this operation might be time consuming. */
+static void dump_process(DumpState *s, Error **errp)
+{
+ Error *local_err = NULL;
+
+ if (s->has_format && s->format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
+ create_kdump_vmcore(s, &local_err);
+ } else {
+ create_vmcore(s, &local_err);
+ }
+
+ s->status = (local_err ? DUMP_STATUS_FAILED : DUMP_STATUS_COMPLETED);
+ error_propagate(errp, local_err);
+
+ dump_cleanup(s);
+}
+
void qmp_dump_guest_memory(bool paging, const char *file,
bool has_detach, bool detach,
bool has_begin, int64_t begin, bool has_length,
@@ -1679,16 +1699,7 @@ void qmp_dump_guest_memory(bool paging, const char *file,
return;
}
- if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
- create_kdump_vmcore(s, &local_err);
- } else {
- create_vmcore(s, &local_err);
- }
-
- s->status = (local_err ? DUMP_STATUS_FAILED : DUMP_STATUS_COMPLETED);
- error_propagate(errp, local_err);
-
- dump_cleanup(s);
+ dump_process(s, errp);
}
DumpGuestMemoryCapability *qmp_query_dump_guest_memory_capability(Error **errp)
diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h
index affef38..d6f4a9c 100644
--- a/include/sysemu/dump.h
+++ b/include/sysemu/dump.h
@@ -185,6 +185,9 @@ typedef struct DumpState {
size_t num_dumpable; /* number of page that can be dumped */
uint32_t flag_compress; /* indicate the compression format */
DumpStatus status; /* current dump status */
+
+ bool has_format; /* whether format is provided */
+ DumpGuestMemoryFormat format; /* valid only if has_format == true */
} DumpState;
uint16_t cpu_to_dump16(DumpState *s, uint16_t val);
--
2.4.3
