From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmWb5-000181-7w for qemu-devel@nongnu.org; Mon, 19 May 2014 19:04:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmWay-0006iJ-Qb for qemu-devel@nongnu.org; Mon, 19 May 2014 19:03:55 -0400 Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]:51772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmWay-0006hw-KN for qemu-devel@nongnu.org; Mon, 19 May 2014 19:03:48 -0400 Received: by mail-wi0-f175.google.com with SMTP id f8so4985295wiw.2 for ; Mon, 19 May 2014 16:03:47 -0700 (PDT) From: Hani Benhabiles Date: Tue, 20 May 2014 00:03:19 +0100 Message-Id: <1400540600-1328-7-git-send-email-kroosec@gmail.com> In-Reply-To: <1400540600-1328-1-git-send-email-kroosec@gmail.com> References: <1400540600-1328-1-git-send-email-kroosec@gmail.com> Subject: [Qemu-devel] [PATCH 6/7] monitor: Add host_net_remove arguments completion. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com, stefanha@redhat.com, imammedo@redhat.com 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 --- hmp-commands.hx | 1 + hmp.h | 2 ++ monitor.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 6aaec1b..935f744 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 22ee836..a53ad51 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 365c66a..805d29f 100644 --- a/monitor.c +++ b/monitor.c @@ -4607,6 +4607,44 @@ void host_net_add_completion(ReadLineState *rs, int nb_args, const char *str) add_completion_option(rs, str, "bridge"); } +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, -- 1.8.3.2