[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] monitor: Add set_link arguments completion.
From: |
Hani Benhabiles |
Subject: |
[Qemu-devel] [PATCH 5/7] monitor: Add set_link arguments completion. |
Date: |
Sun, 27 Apr 2014 17:00:06 +0100 |
Make it possible to query all net clients without specifying an ID when calling
qemu_find_net_clients_except().
This also adds the add_completion_option() function which is to be used for
other commands completions as well.
Signed-off-by: Hani Benhabiles <address@hidden>
---
hmp-commands.hx | 1 +
hmp.h | 1 +
monitor.c | 34 ++++++++++++++++++++++++++++++++++
net/net.c | 2 +-
4 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 648400a..353161f 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1333,6 +1333,7 @@ ETEXI
.params = "name on|off",
.help = "change the link status of a network adapter",
.mhandler.cmd = hmp_set_link,
+ .command_completion = set_link_completion,
},
STEXI
diff --git a/hmp.h b/hmp.h
index 9fc48b2..dec29c7 100644
--- a/hmp.h
+++ b/hmp.h
@@ -101,5 +101,6 @@ void sendkey_completion(ReadLineState *rs, int nb_args,
const char *str);
void help_completion(ReadLineState *rs, int nb_args, const char *str);
void chardev_remove_completion(ReadLineState *rs, int nb_args, const char
*str);
void chardev_add_completion(ReadLineState *rs, int nb_args, const char *str);
+void set_link_completion(ReadLineState *rs, int nb_args, const char *str);
#endif
diff --git a/monitor.c b/monitor.c
index 1ce283a..c7ad78c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4278,6 +4278,17 @@ static const char *next_arg_type(const char *typestr)
return (p != NULL ? ++p : typestr);
}
+static void add_completion_option(ReadLineState *rs, const char *str,
+ const char *option)
+{
+ if (!str || !option) {
+ return;
+ }
+ if (!strncmp(option, str, strlen(str))) {
+ readline_add_completion(rs, option);
+ }
+}
+
void chardev_add_completion(ReadLineState *rs, int nb_args, const char *str)
{
size_t len;
@@ -4470,6 +4481,29 @@ void help_completion(ReadLineState *rs, int nb_args,
const char *str)
}
}
+void set_link_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ size_t len;
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ if (nb_args == 2) {
+ NetClientState *ncs[255];
+ int count, i;
+ count = qemu_find_net_clients_except(NULL, ncs,
+ NET_CLIENT_OPTIONS_KIND_NONE,
255);
+ for (i = 0; i < count; i++) {
+ const char *name = ncs[i]->name;
+ if (!strncmp(str, name, len)) {
+ readline_add_completion(rs, name);
+ }
+ }
+ } else if (nb_args == 3) {
+ add_completion_option(rs, str, "on");
+ add_completion_option(rs, str, "off");
+ }
+}
+
static void monitor_find_completion_by_table(Monitor *mon,
const mon_cmd_t *cmd_table,
char **args,
diff --git a/net/net.c b/net/net.c
index a4aadff..b6cd75f 100644
--- a/net/net.c
+++ b/net/net.c
@@ -633,7 +633,7 @@ int qemu_find_net_clients_except(const char *id,
NetClientState **ncs,
if (nc->info->type == type) {
continue;
}
- if (!strcmp(nc->name, id)) {
+ if (!id || !strcmp(nc->name, id)) {
if (ret < max) {
ncs[ret] = nc;
}
--
1.8.3.2
- [Qemu-devel] [PATCH 0/7] Miscellaneous command completion patches, Hani Benhabiles, 2014/04/27
- [Qemu-devel] [PATCH 1/7] monitor: Convert sendkey to use command_completion., Hani Benhabiles, 2014/04/27
- [Qemu-devel] [PATCH 2/7] monitor: Convert help|? to use command_completion., Hani Benhabiles, 2014/04/27
- [Qemu-devel] [PATCH 3/7] monitor: Add chardev-remove command completion., Hani Benhabiles, 2014/04/27
- [Qemu-devel] [PATCH 4/7] monitor: Add chardev-add backend argument completion., Hani Benhabiles, 2014/04/27
- [Qemu-devel] [PATCH 5/7] monitor: Add set_link arguments completion.,
Hani Benhabiles <=
- [Qemu-devel] [PATCH 6/7] monitor: Add netdev_add type argument completion., Hani Benhabiles, 2014/04/27
- [Qemu-devel] [PATCH 7/7] monitor: Add netdev_del id argument completion., Hani Benhabiles, 2014/04/27