ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitor: support sub command in auto completion 

This patch allows 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 <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Wenchao Xia 2013-08-27 20:38:25 +08:00 committed by Luiz Capitulino
parent c35b640033
commit d903a779cf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
monitor.c
View File

@ -4262,6 +4262,12 @@ static void monitor_find_completion_by_table(Monitor *mon,
return; 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); ptype = next_arg_type(cmd->args_type);
for(i = 0; i < nb_args - 2; i++) { for(i = 0; i < nb_args - 2; i++) {
if (*ptype != '\0') { if (*ptype != '\0') {
@ -4288,13 +4294,7 @@ static void monitor_find_completion_by_table(Monitor *mon,
bdrv_iterate(block_completion_it, &mbs); bdrv_iterate(block_completion_it, &mbs);
break; break;
case 's': case 's':
/* XXX: more generic ? */ if (!strcmp(cmd->name, "sendkey")) {
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")) {
char *sep = strrchr(str, '-'); char *sep = strrchr(str, '-');
if (sep) if (sep)
str = sep + 1; str = sep + 1;