[Qemu-devel] [RFC][PATCH 12/16 v6] support to cancel the current dumping

[Wen Congyang]

Add API to allow the user to cancel the current dumping.

Signed-off-by: Wen Congyang <address@hidden>
---
 dump.c           |   13 +++++++++++++
 hmp-commands.hx  |   14 ++++++++++++++
 hmp.c            |    5 +++++
 hmp.h            |    1 +
 qapi-schema.json |   13 +++++++++++++
 qmp-commands.hx  |   21 +++++++++++++++++++++
 6 files changed, 67 insertions(+), 0 deletions(-)

diff --git a/dump.c b/dump.c
index 0f5fcb6..cea4c8c 100644
--- a/dump.c
+++ b/dump.c
@@ -709,3 +709,16 @@ void qmp_dump(bool detach, const char *file, Error **errp)
 
     return;
 }
+
+void qmp_dump_cancel(Error **errp)
+{
+    DumpState *s = dump_get_current();
+
+    if (s->state != DUMP_STATE_ACTIVE) {
+        return;
+    }
+
+    s->state = DUMP_STATE_CANCELLED;
+    dump_cleanup(s);
+    return;
+}
diff --git a/hmp-commands.hx b/hmp-commands.hx
index ed3544c..d0f3485 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -883,6 +883,20 @@ Dump to @var{file} (using -d to not wait for completion).
 ETEXI
 
     {
+        .name       = "dump_cancel",
+        .args_type  = "",
+        .params     = "",
+        .help       = "cancel the current VM dumping",
+        .mhandler.cmd = hmp_dump_cancel,
+    },
+
+STEXI
address@hidden dump_cancel
address@hidden dump_cancel
+Cancel the current VM dumping.
+ETEXI
+
+    {
         .name       = "snapshot_blkdev",
         .args_type  = "device:B,snapshot-file:s?,format:s?",
         .params     = "device [new-image-file] [format]",
diff --git a/hmp.c b/hmp.c
index 7e08332..3865032 100644
--- a/hmp.c
+++ b/hmp.c
@@ -861,3 +861,8 @@ void hmp_dump(Monitor *mon, const QDict *qdict)
     qmp_dump(detach, file, &errp);
     hmp_handle_error(mon, &errp);
 }
+
+void hmp_dump_cancel(Monitor *mon, const QDict *qdict)
+{
+    qmp_dump_cancel(NULL);
+}
diff --git a/hmp.h b/hmp.h
index 66984c5..c712f63 100644
--- a/hmp.h
+++ b/hmp.h
@@ -59,5 +59,6 @@ void hmp_block_stream(Monitor *mon, const QDict *qdict);
 void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict);
 void hmp_block_job_cancel(Monitor *mon, const QDict *qdict);
 void hmp_dump(Monitor *mon, const QDict *qdict);
+void hmp_dump_cancel(Monitor *mon, const QDict *qdict);
 
 #endif
diff --git a/qapi-schema.json b/qapi-schema.json
index d39cb41..e5fd056 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1596,3 +1596,16 @@
 # Since: 1.1
 ##
 { 'command': 'dump', 'data': { 'detach': 'bool', 'file': 'str' } }
+
+##
+# @dump_cancel
+#
+# Cancel the current executing dumping process.
+#
+# Returns: nothing on success
+#
+# Notes: This command succeeds even if there is no dumping process running.
+#
+# Since: 1.1
+##
+{ 'command': 'dump_cancel' }
diff --git a/qmp-commands.hx b/qmp-commands.hx
index b0aa22e..c09ca86 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -593,6 +593,27 @@ Example:
 EQMP
 
     {
+        .name       = "dump_cancel",
+        .args_type  = "",
+        .mhandler.cmd_new = qmp_marshal_input_dump_cancel,
+    },
+
+SQMP
+dump_cancel
+
+
+Cancel the current dumping.
+
+Arguments: None.
+
+Example:
+
+-> { "execute": "dump_cancel" }
+<- { "return": {} }
+
+EQMP
+
+    {
         .name       = "netdev_add",
         .args_type  = "netdev:O",
         .params     = "[user|tap|socket],id=str[,prop=value][,...]",
-- 
1.7.1