From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsPYr-0006em-N6 for qemu-devel@nongnu.org; Thu, 27 Jun 2013 23:41:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsPYq-0007Z4-NF for qemu-devel@nongnu.org; Thu, 27 Jun 2013 23:41:25 -0400 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:40959) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsPYq-0007Yf-2Z for qemu-devel@nongnu.org; Thu, 27 Jun 2013 23:41:24 -0400 Received: from /spool/local by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 28 Jun 2013 09:06:12 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 61D0A125804E for ; Fri, 28 Jun 2013 09:10:20 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5S3fB6v27000836 for ; Fri, 28 Jun 2013 09:11:11 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5S3fFeT026389 for ; Fri, 28 Jun 2013 13:41:15 +1000 From: Wenchao Xia Date: Fri, 28 Jun 2013 11:39:28 +0800 Message-Id: <1372390771-11157-5-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1372390771-11157-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1372390771-11157-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V4 4/7] monitor: avoid direct use of global *info_cmds in help functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com 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. Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake --- monitor.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 53 insertions(+), 10 deletions(-) diff --git a/monitor.c b/monitor.c index 3d16592..7cfda75 100644 --- a/monitor.c +++ b/monitor.c @@ -831,33 +831,76 @@ static void parse_cmdline(const char *cmdline, *pnb_args = nb_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; - 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); + /* 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 (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: + nb_args = min(nb_args, MAX_ARGS); + for (i = 0; i < nb_args; i++) { + g_free(args[i]); + } } static void do_help_cmd(Monitor *mon, const QDict *qdict) -- 1.7.1