From patchwork Fri Mar 2 10:43:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 144210 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 709FCB6EF1 for ; Fri, 2 Mar 2012 21:42:24 +1100 (EST) Received: from localhost ([::1]:51348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3PwM-000621-BH for incoming@patchwork.ozlabs.org; Fri, 02 Mar 2012 05:42:22 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3PwE-0005yc-Tp for qemu-devel@nongnu.org; Fri, 02 Mar 2012 05:42:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S3Pvu-0003P5-CI for qemu-devel@nongnu.org; Fri, 02 Mar 2012 05:42:14 -0500 Received: from [222.73.24.84] (port=18905 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3Pvu-0003Om-0Z for qemu-devel@nongnu.org; Fri, 02 Mar 2012 05:41:54 -0500 X-IronPort-AV: E=Sophos;i="4.73,517,1325433600"; d="scan'208";a="4434306" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 02 Mar 2012 18:41:48 +0800 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 q22Afobp028511; Fri, 2 Mar 2012 18:41:50 +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 2012030218400061-855005 ; Fri, 2 Mar 2012 18:40:00 +0800 Message-ID: <4F50A442.2040604@cn.fujitsu.com> Date: Fri, 02 Mar 2012 18:43:14 +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 , Luiz Capitulino , Eric Blake References: <4F509A00.80207@cn.fujitsu.com> In-Reply-To: <4F509A00.80207@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-03-02 18:40:00, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-03-02 18:40:01, Serialize complete at 2012-03-02 18:40:01 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Subject: [Qemu-devel] [RFC][PATCH 12/16 v8] 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 | 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 9a1e696..63193ec 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 = "device:B,snapshot-file:s?,format:s?", .params = "device [new-image-file] [format]", diff --git a/hmp.c b/hmp.c index a27f6c5..d427e49 100644 --- a/hmp.c +++ b/hmp.c @@ -866,3 +866,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 8b51b1d..d40ba69 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1645,3 +1645,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 c877987..1b36262 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][,...]",