Patchwork [RFC,12/14,v9] support to cancel the current dumping

login
register
mail settings
Submitter Wen Congyang
Date March 14, 2012, 2:12 a.m.
Message ID <4F5FFE75.6050202@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/146531/
State New
Headers show

Comments

Wen Congyang - March 14, 2012, 2:12 a.m.
Add API to allow the user to cancel the current dumping. It can only work after
async dumping is supported.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
 dump.c           |   12 ++++++++++++
 hmp-commands.hx  |   14 ++++++++++++++
 hmp.c            |    5 +++++
 hmp.h            |    1 +
 qapi-schema.json |   13 +++++++++++++
 qmp-commands.hx  |   21 +++++++++++++++++++++
 6 files changed, 66 insertions(+), 0 deletions(-)
Luiz Capitulino - March 14, 2012, 5:19 p.m.
On Wed, 14 Mar 2012 10:12:05 +0800
Wen Congyang <wency@cn.fujitsu.com> wrote:

> Add API to allow the user to cancel the current dumping. It can only work after
> async dumping is supported.

NACK, we shouldn't add it then.

> 
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> ---
>  dump.c           |   12 ++++++++++++
>  hmp-commands.hx  |   14 ++++++++++++++
>  hmp.c            |    5 +++++
>  hmp.h            |    1 +
>  qapi-schema.json |   13 +++++++++++++
>  qmp-commands.hx  |   21 +++++++++++++++++++++
>  6 files changed, 66 insertions(+), 0 deletions(-)
> 
> diff --git a/dump.c b/dump.c
> index 42e1681..dab0c84 100644
> --- a/dump.c
> +++ b/dump.c
> @@ -712,3 +712,15 @@ void qmp_dump(bool paging, const char *file, Error **errp)
>          error_set(errp, QERR_IO_ERROR);
>      }
>  }
> +
> +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);
> +}
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index d4cf2e5..313f876 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -902,6 +902,20 @@ ETEXI
>  #endif
>  
>      {
> +        .name       = "dump_cancel",
> +        .args_type  = "",
> +        .params     = "",
> +        .help       = "cancel the current VM dumping",
> +        .mhandler.cmd = hmp_dump_cancel,
> +    },
> +
> +STEXI
> +@item dump_cancel
> +@findex dump_cancel
> +Cancel the current VM dumping.
> +ETEXI
> +
> +    {
>          .name       = "snapshot_blkdev",
>          .args_type  = "reuse:-n,device:B,snapshot-file:s?,format:s?",
>          .params     = "[-n] device [new-image-file] [format]",
> diff --git a/hmp.c b/hmp.c
> index e13b793..31e85d3 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -870,3 +870,8 @@ void hmp_dump(Monitor *mon, const QDict *qdict)
>      qmp_dump(!!paging, 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 b055e50..75c6c1d 100644
> --- a/hmp.h
> +++ b/hmp.h
> @@ -60,5 +60,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 81b8c7c..1fdfee8 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -1677,3 +1677,16 @@
>  # Since: 1.1
>  ##
>  { 'command': 'dump', 'data': { 'paging': '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 9e39bd9..cbe5b91 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -621,6 +621,27 @@ EQMP
>  #endif
>  
>      {
> +        .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][,...]",

Patch

diff --git a/dump.c b/dump.c
index 42e1681..dab0c84 100644
--- a/dump.c
+++ b/dump.c
@@ -712,3 +712,15 @@  void qmp_dump(bool paging, const char *file, Error **errp)
         error_set(errp, QERR_IO_ERROR);
     }
 }
+
+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);
+}
diff --git a/hmp-commands.hx b/hmp-commands.hx
index d4cf2e5..313f876 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -902,6 +902,20 @@  ETEXI
 #endif
 
     {
+        .name       = "dump_cancel",
+        .args_type  = "",
+        .params     = "",
+        .help       = "cancel the current VM dumping",
+        .mhandler.cmd = hmp_dump_cancel,
+    },
+
+STEXI
+@item dump_cancel
+@findex dump_cancel
+Cancel the current VM dumping.
+ETEXI
+
+    {
         .name       = "snapshot_blkdev",
         .args_type  = "reuse:-n,device:B,snapshot-file:s?,format:s?",
         .params     = "[-n] device [new-image-file] [format]",
diff --git a/hmp.c b/hmp.c
index e13b793..31e85d3 100644
--- a/hmp.c
+++ b/hmp.c
@@ -870,3 +870,8 @@  void hmp_dump(Monitor *mon, const QDict *qdict)
     qmp_dump(!!paging, 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 b055e50..75c6c1d 100644
--- a/hmp.h
+++ b/hmp.h
@@ -60,5 +60,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 81b8c7c..1fdfee8 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1677,3 +1677,16 @@ 
 # Since: 1.1
 ##
 { 'command': 'dump', 'data': { 'paging': '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 9e39bd9..cbe5b91 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -621,6 +621,27 @@  EQMP
 #endif
 
     {
+        .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][,...]",