[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V6 11/13] monitor: support sub command in auto compl
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V6 11/13] monitor: support sub command in auto completion |
Date: |
Thu, 11 Jul 2013 11:13:47 +0800 |
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 <address@hidden>
---
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
- Re: [Qemu-devel] [PATCH V6 05/13] monitor: avoid use of global *cur_mon in readline_completion(), (continued)
[Qemu-devel] [PATCH V6 06/13] monitor: avoid direct use of global variable *mon_cmds, Wenchao Xia, 2013/07/10
[Qemu-devel] [PATCH V6 07/13] monitor: code move for parse_cmdline(), Wenchao Xia, 2013/07/10
[Qemu-devel] [PATCH V6 08/13] monitor: refine parse_cmdline(), Wenchao Xia, 2013/07/10
[Qemu-devel] [PATCH V6 09/13] monitor: support sub command in help, Wenchao Xia, 2013/07/10
[Qemu-devel] [PATCH V6 10/13] monitor: refine monitor_find_completion(), Wenchao Xia, 2013/07/10
[Qemu-devel] [PATCH V6 11/13] monitor: support sub command in auto completion,
Wenchao Xia <=
[Qemu-devel] [PATCH V6 12/13] monitor: allow "help" show message for single command in sub group, Wenchao Xia, 2013/07/10
[Qemu-devel] [PATCH V6 13/13] monitor: improve auto complete of "help" for single command in sub group, Wenchao Xia, 2013/07/10