From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RniJW-0004Tw-3K for qemu-devel@nongnu.org; Wed, 18 Jan 2012 22:05:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RniJU-0000cX-Ir for qemu-devel@nongnu.org; Wed, 18 Jan 2012 22:05:22 -0500 Received: from [222.73.24.84] (port=49810 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RniJT-0000cM-MA for qemu-devel@nongnu.org; Wed, 18 Jan 2012 22:05:20 -0500 Message-ID: <4F1788F7.3080205@cn.fujitsu.com> Date: Thu, 19 Jan 2012 11:07:35 +0800 From: Wen Congyang MIME-Version: 1.0 References: <4F1784EE.2040800@cn.fujitsu.com> In-Reply-To: <4F1784EE.2040800@cn.fujitsu.com> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1 Subject: [Qemu-devel] [RFC][PATCH 12/15 v5] support to cancel the current dumping List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , Jan Kiszka , Dave Anderson , HATAYAMA Daisuke , Luiz Capitulino Add API to allow the user to cancel the current dumping. Signed-off-by: Wen Congyang --- 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 14c2642..485e3f3 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 4582875..57f5a20 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -844,6 +844,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 +@item dump_cancel +@findex 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 1ae8926..bca411b 100644 --- a/hmp.c +++ b/hmp.c @@ -691,3 +691,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 8d6a5d2..c0037b6 100644 --- a/hmp.h +++ b/hmp.h @@ -50,5 +50,6 @@ void hmp_migrate_cancel(Monitor *mon, const QDict *qdict); void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict); void hmp_migrate_set_speed(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 f96268a..bbd2011 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1288,3 +1288,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 59ddd98..055072d 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -599,6 +599,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