From patchwork Thu Dec 27 09:40:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 208289 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 4496E2C007E for ; Thu, 27 Dec 2012 20:41:25 +1100 (EST) Received: from localhost ([::1]:46678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1To9xr-0007fg-FT for incoming@patchwork.ozlabs.org; Thu, 27 Dec 2012 04:41:23 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1To9xY-0007XR-Qy for qemu-devel@nongnu.org; Thu, 27 Dec 2012 04:41:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1To9xU-0006wJ-P2 for qemu-devel@nongnu.org; Thu, 27 Dec 2012 04:41:04 -0500 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:47886) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1To9xU-0006vw-2j for qemu-devel@nongnu.org; Thu, 27 Dec 2012 04:41:00 -0500 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 27 Dec 2012 19:37:30 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp06.au.ibm.com (202.81.31.212) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 27 Dec 2012 19:37:29 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id A9F8C2CE804A for ; Thu, 27 Dec 2012 20:40:54 +1100 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBR9TVep46792784 for ; Thu, 27 Dec 2012 20:29:31 +1100 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBR9erL0026322 for ; Thu, 27 Dec 2012 20:40:54 +1100 Received: from RedHat62GAWSWenchao (wenchaox.cn.ibm.com [9.115.122.122] (may be forged)) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qBR9eFG9025504; Thu, 27 Dec 2012 20:40:52 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 27 Dec 2012 17:40:27 +0800 Message-Id: <1356601227-8707-5-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1356601227-8707-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1356601227-8707-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12122709-7014-0000-0000-000002643C38 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.148 Cc: aliguori@us.ibm.com, chenwj@iis.sinica.edu.tw, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V3 4/4] HMP: add sub command table to info 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 Now info command takes a table of sub info commands, and changed do_info() to do_info_help() to do help funtion only. Signed-off-by: Wenchao Xia --- hmp-commands.hx | 3 ++- monitor.c | 22 +--------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 010b8c9..87a411a 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1489,7 +1489,8 @@ ETEXI .args_type = "item:s?", .params = "[subcommand]", .help = "show various information about the system state", - .mhandler.cmd = do_info, + .mhandler.cmd = do_info_help, + .sub_table = info_cmds, }, STEXI diff --git a/monitor.c b/monitor.c index a392df4..e1bcaa2 100644 --- a/monitor.c +++ b/monitor.c @@ -807,28 +807,8 @@ static void user_async_cmd_handler(Monitor *mon, const mon_cmd_t *cmd, } } -static void do_info(Monitor *mon, const QDict *qdict) +static void do_info_help(Monitor *mon, const QDict *qdict) { - const mon_cmd_t *cmd; - const char *item = qdict_get_try_str(qdict, "item"); - - if (!item) { - goto help; - } - - for (cmd = info_cmds; cmd->name != NULL; cmd++) { - if (compare_cmd(item, cmd->name)) - break; - } - - if (cmd->name == NULL) { - goto help; - } - - cmd->mhandler.info(mon, NULL); - return; - -help: help_cmd(mon, "info"); }