diff options
| author | Hani Benhabiles <kroosec@gmail.com> | 2014-05-27 23:39:36 +0100 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-06-11 10:10:29 -0400 |
| commit | ddd6b45ce25281a5894e2df0f7af014e83af19f7 (patch) | |
| tree | 501e33085e7ee97604978c16e185555fb405b7fb | |
| parent | e70871d8b5c92e40cedd6fd0b7687c4f0b6ce3ff (diff) | |
| download | focaccia-qemu-ddd6b45ce25281a5894e2df0f7af014e83af19f7.tar.gz focaccia-qemu-ddd6b45ce25281a5894e2df0f7af014e83af19f7.zip | |
monitor: Add host_net_remove arguments completion
Relies on readline unique completion strings patch to make the added vlan/hub completion values unique, instead of using something like a hash table. Signed-off-by: Hani Benhabiles <hani@linux.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| -rw-r--r-- | hmp-commands.hx | 1 | ||||
| -rw-r--r-- | hmp.h | 2 | ||||
| -rw-r--r-- | monitor.c | 38 |
3 files changed, 41 insertions, 0 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx index aab9cf59bb..f99da0efe4 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1227,6 +1227,7 @@ ETEXI .params = "vlan_id name", .help = "remove host VLAN client", .mhandler.cmd = net_host_device_remove, + .command_completion = host_net_remove_completion, }, STEXI diff --git a/hmp.h b/hmp.h index 22ee836469..a53ad51602 100644 --- a/hmp.h +++ b/hmp.h @@ -110,5 +110,7 @@ void watchdog_action_completion(ReadLineState *rs, int nb_args, void migrate_set_capability_completion(ReadLineState *rs, int nb_args, const char *str); void host_net_add_completion(ReadLineState *rs, int nb_args, const char *str); +void host_net_remove_completion(ReadLineState *rs, int nb_args, + const char *str); #endif diff --git a/monitor.c b/monitor.c index 0189bf879c..d6c4f85909 100644 --- a/monitor.c +++ b/monitor.c @@ -4610,6 +4610,44 @@ void host_net_add_completion(ReadLineState *rs, int nb_args, const char *str) } } +void host_net_remove_completion(ReadLineState *rs, int nb_args, const char *str) +{ + NetClientState *ncs[255]; + int count, i, len; + + len = strlen(str); + readline_set_completion_index(rs, len); + if (nb_args == 2) { + count = qemu_find_net_clients_except(NULL, ncs, + NET_CLIENT_OPTIONS_KIND_NONE, 255); + for (i = 0; i < count; i++) { + int id; + char name[16]; + + if (net_hub_id_for_client(ncs[i], &id)) { + continue; + } + snprintf(name, sizeof(name), "%d", id); + if (!strncmp(str, name, len)) { + readline_add_completion(rs, name); + } + } + return; + } else if (nb_args == 3) { + count = qemu_find_net_clients_except(NULL, ncs, + NET_CLIENT_OPTIONS_KIND_NIC, 255); + for (i = 0; i < count; i++) { + const char *name; + + name = ncs[i]->name; + if (!strncmp(str, name, len)) { + readline_add_completion(rs, name); + } + } + return; + } +} + static void monitor_find_completion_by_table(Monitor *mon, const mon_cmd_t *cmd_table, char **args, |