[Qemu-devel] [PATCH v2 4/8] dump-guest-memory: add qmp event DUMP_COMPLETED

[Peter Xu]

To get aligned with QMP interface, one new QMP event DUMP_COMPLETED
is added. It is used when user specified "detach" in dump, and
triggered when the dump finishes. Error message will be appended to
this event if the dump has failed.

Signed-off-by: Peter Xu <address@hidden>
---
 docs/qmp-events.txt | 12 ++++++++++++
 dump.c              | 12 +++++++++++-
 qapi/event.json     | 10 ++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/docs/qmp-events.txt b/docs/qmp-events.txt
index d2f1ce4..fe494f9 100644
--- a/docs/qmp-events.txt
+++ b/docs/qmp-events.txt
@@ -674,3 +674,15 @@ Note: If action is "reset", "shutdown", or "pause" the 
WATCHDOG event is
 followed respectively by the RESET, SHUTDOWN, or STOP events.
 
 Note: this event is rate-limited.
+
+DUMP_COMPLETED
+--------------
+
+Emitted when the guest has finished one memory dump.
+
+Data: None.
+
+Example:
+
+{ "event": "DUMP_COMPLETED",
+  "data": { "msg": "Dump completed successfully" } }
diff --git a/dump.c b/dump.c
index dfd56aa..0d321d4 100644
--- a/dump.c
+++ b/dump.c
@@ -25,6 +25,7 @@
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qmp-commands.h"
+#include "qapi-event.h"
 
 #include <zlib.h>
 #ifdef CONFIG_LZO
@@ -1659,8 +1660,17 @@ static void dump_process(DumpState *s, Error **errp)
 static void *dump_thread(void *data)
 {
     GlobalDumpState *global = (GlobalDumpState *)data;
-    dump_process(global->gds_cur, NULL);
+    Error *local_err = NULL;
+    const char *msg = "Dump completed successfully";
+
+    dump_process(global->gds_cur, &local_err);
     dump_state_release(global);
+
+    /* if detach is used, notify user that dump has finished */
+    if (local_err) {
+        msg = error_get_pretty(local_err);
+    }
+    qapi_event_send_dump_completed(msg, &error_abort);
     return NULL;
 }
 
diff --git a/qapi/event.json b/qapi/event.json
index f0cef01..de24c27 100644
--- a/qapi/event.json
+++ b/qapi/event.json
@@ -356,3 +356,13 @@
 ##
 { 'event': 'MEM_UNPLUG_ERROR',
   'data': { 'device': 'str', 'msg': 'str' } }
+
+##
+# @DUMP_COMPLETED
+#
+# Emitted when background dump has completed
+#
+# Since: 2.6
+##
+{ 'event': 'DUMP_COMPLETED' ,
+  'data': { 'msg': 'str' } }
-- 
2.4.3