[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 11/11] dump-guest-memory: add qmp event DUMP_COMP
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v8 11/11] dump-guest-memory: add qmp event DUMP_COMPLETED |
Date: |
Thu, 18 Feb 2016 13:16:56 +0800 |
One new QMP event DUMP_COMPLETED is added. When a dump finishes, one
DUMP_COMPLETED event will occur to notify the user.
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
---
docs/qmp-events.txt | 18 ++++++++++++++++++
dump.c | 18 ++++++++++++------
qapi/event.json | 16 ++++++++++++++++
3 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/docs/qmp-events.txt b/docs/qmp-events.txt
index 52eb7e2..4e3eb9e 100644
--- a/docs/qmp-events.txt
+++ b/docs/qmp-events.txt
@@ -220,6 +220,24 @@ Data:
},
"timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
+DUMP_COMPLETED
+--------------
+
+Emitted when the guest has finished one memory dump.
+
+Data:
+
+- "result": DumpQueryResult type described in qapi-schema.json
+- "error": Error message when dump failed. This is only a
+ human-readable string provided when dump failed. It should not be
+ parsed in any way (json-string, optional)
+
+Example:
+
+{ "event": "DUMP_COMPLETED",
+ "data": {"result": {"total": 1090650112, "status": "completed",
+ "completed": 1090650112} } }
+
GUEST_PANICKED
--------------
diff --git a/dump.c b/dump.c
index 9dc4946..81d2d4f 100644
--- a/dump.c
+++ b/dump.c
@@ -25,6 +25,7 @@
#include "sysemu/cpus.h"
#include "qapi/qmp/qerror.h"
#include "qmp-commands.h"
+#include "qapi-event.h"
#include <zlib.h>
#ifdef CONFIG_LZO
@@ -1662,6 +1663,7 @@ cleanup:
static void dump_process(DumpState *s, Error **errp)
{
Error *local_err = NULL;
+ DumpQueryResult *result = NULL;
if (s->has_format && s->format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
create_kdump_vmcore(s, &local_err);
@@ -1674,6 +1676,15 @@ static void dump_process(DumpState *s, Error **errp)
atomic_set(&s->status,
(local_err ? DUMP_STATUS_FAILED : DUMP_STATUS_COMPLETED));
+ /* send DUMP_COMPLETED message (unconditionally) */
+ result = qmp_query_dump(NULL);
+ /* should never fail */
+ assert(result);
+ qapi_event_send_dump_completed(result, !!local_err, (local_err ? \
+ error_get_pretty(local_err) : NULL),
+ &error_abort);
+ qapi_free_DumpQueryResult(result);
+
error_propagate(errp, local_err);
dump_cleanup(s);
}
@@ -1682,13 +1693,8 @@ static void *dump_thread(void *data)
{
Error *err = NULL;
DumpState *s = (DumpState *)data;
-
dump_process(s, &err);
-
- if (err) {
- /* TODO: notify user the error */
- error_free(err);
- }
+ error_free(err);
return NULL;
}
diff --git a/qapi/event.json b/qapi/event.json
index 390fd45..1a45a6c 100644
--- a/qapi/event.json
+++ b/qapi/event.json
@@ -369,3 +369,19 @@
##
{ 'event': 'MEM_UNPLUG_ERROR',
'data': { 'device': 'str', 'msg': 'str' } }
+
+##
+# @DUMP_COMPLETED
+#
+# Emitted when background dump has completed
+#
+# @result: DumpQueryResult type described in qapi-schema.json.
+#
+# @error: #optional human-readable error string that provides
+# hint on why dump failed. Only presents on failure. The
+# user should not try to interpret the error string.
+#
+# Since: 2.6
+##
+{ 'event': 'DUMP_COMPLETED' ,
+ 'data': { 'result': 'DumpQueryResult', '*error': 'str' } }
--
2.4.3
- [Qemu-devel] [PATCH v8 01/11] dump-guest-memory: cleanup: removing dump_{error|cleanup}()., (continued)
- [Qemu-devel] [PATCH v8 01/11] dump-guest-memory: cleanup: removing dump_{error|cleanup}()., Peter Xu, 2016/02/18
- [Qemu-devel] [PATCH v8 02/11] dump-guest-memory: add "detach" flag for QMP/HMP interfaces., Peter Xu, 2016/02/18
- [Qemu-devel] [PATCH v8 03/11] dump-guest-memory: using static DumpState, add DumpStatus, Peter Xu, 2016/02/18
- [Qemu-devel] [PATCH v8 04/11] dump-guest-memory: add dump_in_progress() helper function, Peter Xu, 2016/02/18
- [Qemu-devel] [PATCH v8 05/11] dump-guest-memory: introduce dump_process() helper function., Peter Xu, 2016/02/18
- [Qemu-devel] [PATCH v8 06/11] dump-guest-memory: disable dump when in INMIGRATE state, Peter Xu, 2016/02/18
- [Qemu-devel] [PATCH v8 07/11] dump-guest-memory: add "detach" support, Peter Xu, 2016/02/18
- [Qemu-devel] [PATCH v8 08/11] DumpState: adding total_size and written_size fields, Peter Xu, 2016/02/18
- [Qemu-devel] [PATCH v8 09/11] Dump: add qmp command "query-dump", Peter Xu, 2016/02/18
- [Qemu-devel] [PATCH v8 10/11] Dump: add hmp command "info dump", Peter Xu, 2016/02/18
- [Qemu-devel] [PATCH v8 11/11] dump-guest-memory: add qmp event DUMP_COMPLETED,
Peter Xu <=
- Re: [Qemu-devel] [PATCH v7 00/11] Add basic "detach" support for dump-guest-memory, Peter Xu, 2016/02/18
- Re: [Qemu-devel] [PATCH v7 00/11] Add basic "detach" support for dump-guest-memory, Markus Armbruster, 2016/02/18
- Re: [Qemu-devel] [PATCH v7 00/11] Add basic "detach" support for dump-guest-memory, Paolo Bonzini, 2016/02/18