From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ux7NA-00041C-5x for qemu-devel@nongnu.org; Wed, 10 Jul 2013 23:16:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ux7N9-00014q-2u for qemu-devel@nongnu.org; Wed, 10 Jul 2013 23:16:48 -0400 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:46220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ux7N8-00014O-G2 for qemu-devel@nongnu.org; Wed, 10 Jul 2013 23:16:47 -0400 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 11 Jul 2013 13:07:26 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 1EB0C2CE8051 for ; Thu, 11 Jul 2013 13:16:43 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r6B3GXVB2883878 for ; Thu, 11 Jul 2013 13:16:33 +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 r6B3GgwU017834 for ; Thu, 11 Jul 2013 13:16:42 +1000 From: Wenchao Xia Date: Thu, 11 Jul 2013 11:13:47 +0800 Message-Id: <1373512429-17865-12-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1373512429-17865-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1373512429-17865-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V6 11/13] monitor: support sub command in auto completion 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 This patch allow auto completion work normal for sub command case, "info block [DEVICE]" can auto complete now, by re-enter the completion function. In original code "info" is treated as a special case, now it is treated as a sub command group, global variable info_cmds is not used any more. "help" command is still treated as a special case, since it is not a sub command group but want to auto complete command in root command table. Signed-off-by: Wenchao Xia --- monitor.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/monitor.c b/monitor.c index 2721443..9d3a61f 100644 --- a/monitor.c +++ b/monitor.c @@ -4233,6 +4233,12 @@ static void monitor_find_completion_by_table(Monitor *mon, return; } + if (cmd->sub_table) { + /* do the job again */ + return monitor_find_completion_by_table(mon, cmd->sub_table, + &args[1], nb_args - 1); + } + ptype = next_arg_type(cmd->args_type); for(i = 0; i < nb_args - 2; i++) { if (*ptype != '\0') { @@ -4259,13 +4265,7 @@ static void monitor_find_completion_by_table(Monitor *mon, bdrv_iterate(block_completion_it, &mbs); break; case 's': - /* XXX: more generic ? */ - if (!strcmp(cmd->name, "info")) { - readline_set_completion_index(mon->rs, strlen(str)); - for(cmd = info_cmds; cmd->name != NULL; cmd++) { - cmd_completion(mon, str, cmd->name); - } - } else if (!strcmp(cmd->name, "sendkey")) { + if (!strcmp(cmd->name, "sendkey")) { char *sep = strrchr(str, '-'); if (sep) str = sep + 1; -- 1.7.1