From patchwork Wed Jan 4 06:14:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 134216 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ED5ABB6F9D for ; Wed, 4 Jan 2012 17:12:07 +1100 (EST) Received: from localhost ([::1]:58073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiK4x-0003R2-4F for incoming@patchwork.ozlabs.org; Wed, 04 Jan 2012 01:12:03 -0500 Received: from eggs.gnu.org ([140.186.70.92]:33764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiK4n-00039Q-DM for qemu-devel@nongnu.org; Wed, 04 Jan 2012 01:11:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RiK4m-0003HD-2g for qemu-devel@nongnu.org; Wed, 04 Jan 2012 01:11:53 -0500 Received: from [222.73.24.84] (port=59757 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiK4l-0003Gv-1z for qemu-devel@nongnu.org; Wed, 04 Jan 2012 01:11:52 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 25177170028; Wed, 4 Jan 2012 14:11:50 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q046Bm4X017421; Wed, 4 Jan 2012 14:11:48 +0800 Received: from [10.167.225.226] ([10.167.225.226]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2012010414105155-231844 ; Wed, 4 Jan 2012 14:10:51 +0800 Message-ID: <4F03EE2A.30305@cn.fujitsu.com> Date: Wed, 04 Jan 2012 14:14:02 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: qemu-devel , Jan Kiszka , Dave Anderson , HATAYAMA Daisuke References: <4F03E735.2050804@cn.fujitsu.com> In-Reply-To: <4F03E735.2050804@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-01-04 14:10:51, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-01-04 14:10:55, Serialize complete at 2012-01-04 14:10:55 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) X-Received-From: 222.73.24.84 Subject: [Qemu-devel] [RFC][PATCH 11/14 v4] support to cancel the current dumping X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add API to allow the user to cancel the current dumping. Signed-off-by: Wen Congyang --- dump.c | 14 ++++++++++++++ hmp-commands.hx | 14 ++++++++++++++ hmp.c | 5 +++++ hmp.h | 1 + qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 21 +++++++++++++++++++++ 6 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dump.c b/dump.c index 6acc252..3848d25 100644 --- a/dump.c +++ b/dump.c @@ -24,6 +24,7 @@ #include "sysemu.h" #include "bswap.h" #include "memory_mapping.h" +#include "qmp-commands.h" #define CPU_CONVERT_TO_TARGET16(val) \ ({ \ @@ -720,3 +721,16 @@ int do_dump(Monitor *mon, const QDict *qdict, QObject **ret_data) return 0; } + +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 ef0d53a..83d40b6 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 e7659d5..7fc89db 100644 --- a/hmp.c +++ b/hmp.c @@ -679,3 +679,8 @@ void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict) int64_t value = qdict_get_int(qdict, "value"); qmp_migrate_set_speed(value, NULL); } + +void hmp_dump_cancel(Monitor *mon, const QDict *qdict) +{ + qmp_dump_cancel(NULL); +} diff --git a/hmp.h b/hmp.h index 093242d..409e809 100644 --- a/hmp.h +++ b/hmp.h @@ -49,5 +49,6 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict); 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_cancel(Monitor *mon, const QDict *qdict); #endif diff --git a/qapi-schema.json b/qapi-schema.json index 44cf764..f5f79b0 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1275,3 +1275,16 @@ { 'command': 'qom-set', 'data': { 'path': 'str', 'property': 'str', 'value': 'visitor' }, 'gen': 'no' } + +## +# @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 f359dff..5207a41 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][,...]",