From patchwork Wed Jan 4 06:16:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 134218 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 5F60DB6FA9 for ; Wed, 4 Jan 2012 17:14:16 +1100 (EST) Received: from localhost ([::1]:33906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiK71-0005gJ-PU for incoming@patchwork.ozlabs.org; Wed, 04 Jan 2012 01:14:11 -0500 Received: from eggs.gnu.org ([140.186.70.92]:34265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiK6v-0005gA-L5 for qemu-devel@nongnu.org; Wed, 04 Jan 2012 01:14:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RiK6u-0003iV-B4 for qemu-devel@nongnu.org; Wed, 04 Jan 2012 01:14:05 -0500 Received: from [222.73.24.84] (port=50887 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiK6r-0003hn-Bj for qemu-devel@nongnu.org; Wed, 04 Jan 2012 01:14:04 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 7C0EA170028; Wed, 4 Jan 2012 14:13:57 +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 q046DtAQ017527; Wed, 4 Jan 2012 14:13:55 +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 2012010414130124-231875 ; Wed, 4 Jan 2012 14:13:01 +0800 Message-ID: <4F03EEAC.4050400@cn.fujitsu.com> Date: Wed, 04 Jan 2012 14:16:12 +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:13:01, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-01-04 14:13:02, Serialize complete at 2012-01-04 14:13:02 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) X-Received-From: 222.73.24.84 Subject: [Qemu-devel] [RFC][PATCH 13/14 v4] support to query dumping status 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 query dumping status. Signed-off-by: Wen Congyang --- dump.c | 30 ++++++++++++++++++++++++++++++ hmp-commands.hx | 2 ++ hmp.c | 13 +++++++++++++ hmp.h | 1 + monitor.c | 7 +++++++ qapi-schema.json | 26 ++++++++++++++++++++++++++ qmp-commands.hx | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dump.c b/dump.c index 2131e22..4276cb8 100644 --- a/dump.c +++ b/dump.c @@ -746,3 +746,33 @@ void qmp_dump_set_speed(int64_t value, Error **errp) s->bandwidth = value; return; } + +DumpInfo *qmp_query_dump(Error **errp) +{ + DumpInfo *info = g_malloc0(sizeof(*info)); + DumpState *s = dump_get_current(); + + switch (s->state) { + case DUMP_STATE_SETUP: + /* no migration has happened ever */ + break; + case DUMP_STATE_ACTIVE: + info->has_status = true; + info->status = g_strdup("active"); + break; + case DUMP_STATE_COMPLETED: + info->has_status = true; + info->status = g_strdup("completed"); + break; + case DUMP_STATE_ERROR: + info->has_status = true; + info->status = g_strdup("failed"); + break; + case DUMP_STATE_CANCELLED: + info->has_status = true; + info->status = g_strdup("cancelled"); + break; + } + + return info; +} diff --git a/hmp-commands.hx b/hmp-commands.hx index 20543dd..1eaaf18 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1397,6 +1397,8 @@ show device tree show qdev device model list @item info roms show roms +@item info dump +show dumping status @end table ETEXI diff --git a/hmp.c b/hmp.c index be64075..04ed86a 100644 --- a/hmp.c +++ b/hmp.c @@ -690,3 +690,16 @@ void hmp_dump_set_speed(Monitor *mon, const QDict *qdict) int64_t value = qdict_get_int(qdict, "value"); qmp_dump_set_speed(value, NULL); } + +void hmp_info_dump(Monitor *mon) +{ + DumpInfo *info; + + info = qmp_query_dump(NULL); + + if (info->has_status) { + monitor_printf(mon, "Dumping status: %s\n", info->status); + } + + qapi_free_DumpInfo(info); +} diff --git a/hmp.h b/hmp.h index 3aa947c..5f58b9e 100644 --- a/hmp.h +++ b/hmp.h @@ -51,5 +51,6 @@ 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); void hmp_dump_set_speed(Monitor *mon, const QDict *qdict); +void hmp_info_dump(Monitor *mon); #endif diff --git a/monitor.c b/monitor.c index edd6aa7..b1d09cc 100644 --- a/monitor.c +++ b/monitor.c @@ -2739,6 +2739,13 @@ static mon_cmd_t info_cmds[] = { .mhandler.info = do_trace_print_events, }, { + .name = "dump", + .args_type = "", + .params = "", + .help = "show dumping status", + .mhandler.info = hmp_info_dump, + }, + { .name = NULL, }, }; diff --git a/qapi-schema.json b/qapi-schema.json index ca324d6..087027a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1303,3 +1303,29 @@ # Since: 1.1 ## { 'command': 'dump_set_speed', 'data': {'value': 'int'} } + +## +# @DumpInfo +# +# Information about current migration process. +# +# @status: #optional string describing the current dumping status. +# As of 1,1 this can be 'active', 'completed', 'failed' or +# 'cancelled'. If this field is not returned, no migration process +# has been initiated +# +# Since: 1.1 +## +{ 'type': 'DumpInfo', + 'data': {'*status': 'str'} } + +## +# @query-dump +# +# Returns information about current dumping process. +# +# Returns: @DumpInfo +# +# Since: 1.1 +## +{ 'command': 'query-dump', 'returns': 'DumpInfo' } diff --git a/qmp-commands.hx b/qmp-commands.hx index 6f84cdc..bccc3a4 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2040,6 +2040,53 @@ EQMP }, SQMP +query-dump +------------- + +Dumping status. + +Return a json-object. + +The main json-object contains the following: + +- "status": migration status (json-string) + - Possible values: "active", "completed", "failed", "cancelled" + +Examples: + +1. Before the first migration + +-> { "execute": "query-dump" } +<- { "return": {} } + +2. Migration is done and has succeeded + +-> { "execute": "query-dump" } +<- { "return": { "status": "completed" } } + +3. Migration is done and has failed + +-> { "execute": "query-dump" } +<- { "return": { "status": "failed" } } + +4. Migration is being performed: + +-> { "execute": "query-dump" } +<- { + "return":{ + "status":"active", + } + } + +EQMP + + { + .name = "query-dump", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_dump, + }, + +SQMP query-balloon -------------