From patchwork Mon Jun 24 12:48:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 253828 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5B86B2C0095 for ; Mon, 24 Jun 2013 22:52:53 +1000 (EST) Received: from localhost ([::1]:50291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur6GJ-0007Ib-H2 for incoming@patchwork.ozlabs.org; Mon, 24 Jun 2013 08:52:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur6EB-0003Yh-5g for qemu-devel@nongnu.org; Mon, 24 Jun 2013 08:50:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ur6E9-0001l7-PB for qemu-devel@nongnu.org; Mon, 24 Jun 2013 08:50:39 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:53085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur6E9-0001kZ-5R for qemu-devel@nongnu.org; Mon, 24 Jun 2013 08:50:37 -0400 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 24 Jun 2013 18:13:05 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp06.in.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 24 Jun 2013 18:13:03 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 6DA453940043 for ; Mon, 24 Jun 2013 18:20:28 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5OCofV627852992 for ; Mon, 24 Jun 2013 18:20:42 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5OCoSDO015868 for ; Mon, 24 Jun 2013 22:50:28 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.50] (may be forged)) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5OCmmNx009047; Mon, 24 Jun 2013 22:50:27 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 24 Jun 2013 20:48:41 +0800 Message-Id: <1372078125-31085-4-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1372078125-31085-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1372078125-31085-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13062412-9574-0000-0000-000008706D47 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.6 Cc: pbonzini@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V2 3/7] monitor: discard global variable *info_cmds in help functions 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 In help functions info_cmds is treated as sub command group now, not as a special case any more. Still help can't show message for single command under "info", since command parser reject additional parameter, which can be improved by change "help" item parameter define later. "log" is still treated as special help case. compare_cmd() is used instead of strcmp() in command searching. To tip better what the patch does, code moving is avoided by declare parse_cmdline() ahead. Signed-off-by: Wenchao Xia --- monitor.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 56 insertions(+), 11 deletions(-) diff --git a/monitor.c b/monitor.c index 528e4a8..54fc36f 100644 --- a/monitor.c +++ b/monitor.c @@ -733,33 +733,80 @@ static int compare_cmd(const char *name, const char *list) return 0; } +#define MAX_ARGS 16 + +static void parse_cmdline(const char *cmdline, + int *pnb_args, char **args); + +static void help_cmd_dump_one(Monitor *mon, + const mon_cmd_t *cmd, + char **prefix_args, + int prefix_args_nb) +{ + int i; + + for (i = 0; i < prefix_args_nb; i++) { + monitor_printf(mon, "%s ", prefix_args[i]); + } + monitor_printf(mon, "%s %s -- %s\n", cmd->name, cmd->params, cmd->help); +} + static void help_cmd_dump(Monitor *mon, const mon_cmd_t *cmds, - const char *prefix, const char *name) + char **args, int nb_args, int arg_index) { const mon_cmd_t *cmd; + /* Dump all */ + if (arg_index >= nb_args) { + for (cmd = cmds; cmd->name != NULL; cmd++) { + help_cmd_dump_one(mon, cmd, args, arg_index); + } + return; + } + + /* Find one entry to dump */ for(cmd = cmds; cmd->name != NULL; cmd++) { - if (!name || !strcmp(name, cmd->name)) - monitor_printf(mon, "%s%s %s -- %s\n", prefix, cmd->name, - cmd->params, cmd->help); + if (compare_cmd(args[arg_index], cmd->name)) { + if (cmd->sub_table) { + help_cmd_dump(mon, cmd->sub_table, + args, nb_args, arg_index + 1); + } else { + help_cmd_dump_one(mon, cmd, args, arg_index); + } + break; + } } } static void help_cmd(Monitor *mon, const char *name) { - if (name && !strcmp(name, "info")) { - help_cmd_dump(mon, info_cmds, "info ", NULL); - } else { - help_cmd_dump(mon, mon->cmd_table, "", name); - if (name && !strcmp(name, "log")) { + char *args[MAX_ARGS]; + int nb_args = 0, i; + + if (name) { + /* special case for log */ + if (!strcmp(name, "log")) { const QEMULogItem *item; monitor_printf(mon, "Log items (comma separated):\n"); monitor_printf(mon, "%-10s %s\n", "none", "remove all logs"); for (item = qemu_log_items; item->mask != 0; item++) { monitor_printf(mon, "%-10s %s\n", item->name, item->help); } + return; + } + + parse_cmdline(name, &nb_args, args); + if (nb_args >= MAX_ARGS) { + goto cleanup; } } + + help_cmd_dump(mon, mon->cmd_table, args, nb_args, 0); + +cleanup: + for (i = 0; i < nb_args; i++) { + g_free(args[i]); + } } static void do_help_cmd(Monitor *mon, const QDict *qdict) @@ -3533,8 +3580,6 @@ static char *key_get_info(const char *type, char **key) static int default_fmt_format = 'x'; static int default_fmt_size = 4; -#define MAX_ARGS 16 - static int is_valid_option(const char *c, const char *typestr) { char option[3];