From: Hani Benhabiles <kroosec@gmail.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, imammedo@redhat.com, stefanha@redhat.com,
lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH 5/7] monitor: Add set_link arguments completion.
Date: Sun, 9 Mar 2014 12:16:15 +0100 [thread overview]
Message-ID: <1394363777-14132-6-git-send-email-kroosec@gmail.com> (raw)
In-Reply-To: <1394363777-14132-1-git-send-email-kroosec@gmail.com>
This also adds the add_completion_option() function which is to be used for
other commands completions as well.
Signed-off-by: Hani Benhabiles <hani@linux.com>
---
hmp-commands.hx | 1 +
hmp.h | 1 +
monitor.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 813c0fb..fbd303a 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1332,6 +1332,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 59a60ed..df19f1c 100644
--- a/hmp.h
+++ b/hmp.h
@@ -99,6 +99,7 @@ void object_del_completion(Monitor *mon, int nb_args, const char *str);
void chardev_add_completion(Monitor *mon, int nb_args, const char *str);
void chardev_remove_completion(Monitor *mon, int nb_args, const char *str);
void cpu_completion(Monitor *mon, int nb_args, const char *str);
+void set_link_completion(Monitor *mon, int nb_args, const char *str);
#endif
diff --git a/monitor.c b/monitor.c
index 43aab76..9905113 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(Monitor *mon, const char *str,
+ const char *option)
+{
+ if (!str || !option) {
+ return;
+ }
+ if (!strncmp(option, str, strlen(str))) {
+ readline_add_completion(mon->rs, option);
+ }
+}
+
void chardev_add_completion(Monitor *mon, int nb_args, const char *str)
{
size_t len;
@@ -4453,6 +4464,40 @@ void cpu_completion(Monitor *mon, int nb_args, const char *str)
qapi_free_CpuInfoList(start);
}
+struct NicCompletionData {
+ Monitor *mon;
+ const char *str;
+};
+
+static void check_nic_completion(NICState *nic, void *data)
+{
+ Monitor *mon;
+ const char *str, *name;
+
+ mon = ((struct NicCompletionData *) data)->mon;
+ str = ((struct NicCompletionData *) data)->str;
+ name = nic->ncs->name;
+
+ if (!strncmp(name, str, strlen(str))) {
+ readline_add_completion(mon->rs, nic->ncs->name);
+ }
+}
+
+void set_link_completion(Monitor *mon, int nb_args, const char *str)
+{
+ readline_set_completion_index(mon->rs, strlen(str));
+ if (nb_args == 2) {
+ struct NicCompletionData data = {
+ .mon = mon,
+ .str = str,
+ };
+ qemu_foreach_nic(check_nic_completion, &data);
+ } else if (nb_args == 3) {
+ add_completion_option(mon, str, "on");
+ add_completion_option(mon, str, "off");
+ }
+}
+
static void monitor_find_completion_by_table(Monitor *mon,
const mon_cmd_t *cmd_table,
char **args,
--
1.8.3.2
next prev parent reply other threads:[~2014-03-09 11:19 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-09 11:16 [Qemu-devel] [PATCH 0/7] monitor: Completion support for various commands Hani Benhabiles
2014-03-09 11:16 ` [Qemu-devel] [PATCH 1/7] monitor: Add command_completion callback to mon_cmd_t Hani Benhabiles
2014-03-27 20:21 ` Luiz Capitulino
2014-03-27 21:55 ` Hani Benhabiles
2014-03-28 13:10 ` Luiz Capitulino
2014-03-09 11:16 ` [Qemu-devel] [PATCH 2/7] monitor: Add chardev-remove id argument completion Hani Benhabiles
2014-03-09 11:16 ` [Qemu-devel] [PATCH 3/7] monitor: Add chardev-add backend " Hani Benhabiles
2014-03-09 11:16 ` [Qemu-devel] [PATCH 4/7] monitor: Add cpu index " Hani Benhabiles
2014-03-27 20:24 ` Luiz Capitulino
2014-03-27 21:51 ` Hani Benhabiles
2014-03-09 11:16 ` Hani Benhabiles [this message]
2014-03-09 11:16 ` [Qemu-devel] [PATCH 6/7] monitor: Add netdev_add type " Hani Benhabiles
2014-03-09 11:16 ` [Qemu-devel] [PATCH 7/7] monitor: Add netdev_del id " Hani Benhabiles
2014-03-10 14:44 ` [Qemu-devel] [PATCH 0/7] monitor: Completion support for various commands Luiz Capitulino
2014-03-11 7:18 ` Hani Benhabiles
2014-03-27 20:26 ` Luiz Capitulino
2014-03-27 21:47 ` Hani Benhabiles
[not found] <1398614409-30792-1-git-send-email-kroosec@gmail.com>
[not found] ` <1398614409-30792-6-git-send-email-kroosec@gmail.com>
2014-05-07 9:18 ` [Qemu-devel] [PATCH 5/7] monitor: Add set_link arguments completion Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394363777-14132-6-git-send-email-kroosec@gmail.com \
--to=kroosec@gmail.com \
--cc=imammedo@redhat.com \
--cc=kwolf@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).