From patchwork Thu Jun 27 03:27:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 254933 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 1DBBB2C0084 for ; Thu, 27 Jun 2013 13:31:58 +1000 (EST) Received: from localhost ([::1]:54191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Us2w8-0006Z1-77 for incoming@patchwork.ozlabs.org; Wed, 26 Jun 2013 23:31:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Us2ug-0004mx-Mh for qemu-devel@nongnu.org; Wed, 26 Jun 2013 23:30:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Us2uc-0000rK-7K for qemu-devel@nongnu.org; Wed, 26 Jun 2013 23:30:26 -0400 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:41280) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Us2ub-0000op-Ko for qemu-devel@nongnu.org; Wed, 26 Jun 2013 23:30:22 -0400 Received: from /spool/local by e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 27 Jun 2013 13:20:50 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp03.au.ibm.com (202.81.31.209) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 27 Jun 2013 13:20:47 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 85E563578050 for ; Thu, 27 Jun 2013 13:30:16 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5R3FONQ7995698 for ; Thu, 27 Jun 2013 13:15:25 +1000 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5R3UFZX029737 for ; Thu, 27 Jun 2013 13:30:15 +1000 Received: from RH63Wenchao.localdomain ([9.77.178.220]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5R3RvIc024842; Thu, 27 Jun 2013 13:30:13 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 27 Jun 2013 11:27:42 +0800 Message-Id: <1372303666-12323-4-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1372303666-12323-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1372303666-12323-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13062703-6102-0000-0000-000003C3DA03 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.145 Cc: pbonzini@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V3 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];