From patchwork Thu Mar 1 02:53:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 143886 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 E7FDBB6F98 for ; Thu, 1 Mar 2012 13:52:24 +1100 (EST) Received: from localhost ([::1]:58204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2w7y-0000Xf-Sh for incoming@patchwork.ozlabs.org; Wed, 29 Feb 2012 21:52:22 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2w7m-0000WW-8J for qemu-devel@nongnu.org; Wed, 29 Feb 2012 21:52:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2w7j-0007EN-Ro for qemu-devel@nongnu.org; Wed, 29 Feb 2012 21:52:09 -0500 Received: from [222.73.24.84] (port=49802 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2w7i-0007Di-QG for qemu-devel@nongnu.org; Wed, 29 Feb 2012 21:52:07 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 8713B17011A; Thu, 1 Mar 2012 10:52:04 +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 q212q2OW008136; Thu, 1 Mar 2012 10:52:03 +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 2012030110501516-829712 ; Thu, 1 Mar 2012 10:50:15 +0800 Message-ID: <4F4EE49F.5050404@cn.fujitsu.com> Date: Thu, 01 Mar 2012 10:53:19 +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: <4F4EE080.9060307@cn.fujitsu.com> In-Reply-To: <4F4EE080.9060307@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-03-01 10:50:15, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-03-01 10:50:16, Serialize complete at 2012-03-01 10:50:16 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 v7] 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 | 32 ++++++++++++++++++++++++++++++++ hmp-commands.hx | 2 ++ hmp.c | 17 +++++++++++++++++ hmp.h | 1 + monitor.c | 7 +++++++ qapi-schema.json | 26 ++++++++++++++++++++++++++ qmp-commands.hx | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 137 insertions(+), 0 deletions(-) diff --git a/dump.c b/dump.c index 673720f..48779d8 100644 --- a/dump.c +++ b/dump.c @@ -648,3 +648,35 @@ void qmp_dump_cancel(Error **errp) dump_cleanup(s); 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"); + info->has_error = true; + info->error = g_strdup(s->error); + 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 e6db6b6..0c0a7b4 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1434,6 +1434,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 a20a7b0..476d355 100644 --- a/hmp.c +++ b/hmp.c @@ -870,3 +870,20 @@ void hmp_dump_cancel(Monitor *mon, const QDict *qdict) { qmp_dump_cancel(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); + } + + if (info->has_error) { + monitor_printf(mon, "Dumping failed reason: %s\n", info->error); + } + + qapi_free_DumpInfo(info); +} diff --git a/hmp.h b/hmp.h index 75c6c1d..3d105a9 100644 --- a/hmp.h +++ b/hmp.h @@ -61,5 +61,6 @@ 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); +void hmp_info_dump(Monitor *mon); #endif diff --git a/monitor.c b/monitor.c index 96af5e0..f240895 100644 --- a/monitor.c +++ b/monitor.c @@ -2603,6 +2603,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 a764cd3..1e9af32 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1619,3 +1619,29 @@ # Since: 1.1 ## { 'command': 'dump_cancel' } + +## +# @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', '*error': '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 a2d94a9..666f1bc 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -612,6 +612,11 @@ Example: -> { "execute": "dump", "arguments": { "file": "fd:dump" } } <- { "return": {} } +Notes: + +(1) The 'info dump' command should be used to check dumping's progress + and final result (this information is provided by the 'status' member) + EQMP #endif @@ -2046,6 +2051,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 -------------