From: Hani Benhabiles <kroosec@gmail.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, aliguori@amazon.com, lcapitulino@redhat.com,
stefanha@redhat.com, imammedo@redhat.com
Subject: [Qemu-devel] [PATCH v2 17/17] monitor: Add delvm and loadvm argument completion.
Date: Sun, 30 Mar 2014 11:58:39 +0100 [thread overview]
Message-ID: <1396177119-24955-18-git-send-email-kroosec@gmail.com> (raw)
In-Reply-To: <1396177119-24955-1-git-send-email-kroosec@gmail.com>
Signed-off-by: Hani Benhabiles <hani@linux.com>
---
hmp-commands.hx | 2 ++
hmp.h | 2 ++
monitor.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 04aa059..b59d0e0 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -335,6 +335,7 @@ ETEXI
.params = "tag|id",
.help = "restore a VM snapshot from its tag or id",
.mhandler.cmd = do_loadvm,
+ .command_completion = loadvm_completion,
},
STEXI
@@ -350,6 +351,7 @@ ETEXI
.params = "tag|id",
.help = "delete a VM snapshot from its tag or id",
.mhandler.cmd = do_delvm,
+ .command_completion = delvm_completion,
},
STEXI
diff --git a/hmp.h b/hmp.h
index 6e76473..40d1513 100644
--- a/hmp.h
+++ b/hmp.h
@@ -113,5 +113,7 @@ 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);
void mouse_set_completion(ReadLineState *rs, int nb_args, const char *str);
+void delvm_completion(ReadLineState *rs, int nb_args, const char *str);
+void loadvm_completion(ReadLineState *rs, int nb_args, const char *str);
#endif
diff --git a/monitor.c b/monitor.c
index 385fb70..ed57455 100644
--- a/monitor.c
+++ b/monitor.c
@@ -69,6 +69,7 @@
#include "qmp-commands.h"
#include "hmp.h"
#include "qemu/thread.h"
+#include "block/qapi.h"
/* for pic/irq_info */
#if defined(TARGET_SPARC)
@@ -4679,6 +4680,53 @@ void mouse_set_completion(ReadLineState *rs, int nb_args, const char *str)
qapi_free_MouseInfoList(mice_list);
}
+static void vm_completion(ReadLineState *rs, const char *str)
+{
+ size_t len;
+ BlockDriverState *bs = NULL;
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ while ((bs = bdrv_next(bs))) {
+ SnapshotInfoList *snapshots, *snapshot;
+
+ if (!bdrv_can_snapshot(bs)) {
+ continue;
+ }
+ if (bdrv_query_snapshot_info_list(bs, &snapshots, NULL)) {
+ continue;
+ }
+ snapshot = snapshots;
+ while (snapshot) {
+ char *completion = snapshot->value->name;
+ if (!strncmp(str, completion, len)) {
+ readline_add_completion(rs, completion);
+ }
+ completion = snapshot->value->id;
+ if (!strncmp(str, completion, len)) {
+ readline_add_completion(rs, completion);
+ }
+ snapshot = snapshot->next;
+ }
+ qapi_free_SnapshotInfoList(snapshots);
+ }
+
+}
+
+void delvm_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ if (nb_args == 2) {
+ vm_completion(rs, str);
+ }
+}
+
+void loadvm_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ if (nb_args == 2) {
+ vm_completion(rs, str);
+ }
+}
+
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-30 10:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-30 10:58 [Qemu-devel] [PATCH v2 00/17] monitor: Completion support for various commands Hani Benhabiles
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 01/17] monitor: Fix drive_del id argument type completion Hani Benhabiles
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 02/17] monitor: Add command_completion callback to mon_cmd_t Hani Benhabiles
2014-04-11 17:14 ` Luiz Capitulino
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 03/17] monitor: Add device_add and device_del completion Hani Benhabiles
2014-04-11 17:30 ` Luiz Capitulino
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 04/17] monitor: Add chardev-remove id argument completion Hani Benhabiles
2014-04-11 17:36 ` Luiz Capitulino
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 05/17] monitor: Add chardev-add backend " Hani Benhabiles
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 06/17] monitor: Add cpu index " Hani Benhabiles
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 07/17] monitor: Add set_link arguments completion Hani Benhabiles
2014-04-11 17:40 ` Luiz Capitulino
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 08/17] monitor: Add netdev_add type argument completion Hani Benhabiles
2014-04-11 17:44 ` Luiz Capitulino
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 09/17] monitor: Add netdev_del id " Hani Benhabiles
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 10/17] monitor: Add ringbuf_write and ringbuf_read " Hani Benhabiles
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 11/17] monitor: Add watchdog_action " Hani Benhabiles
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 12/17] monitor: Add migrate_set_capability completion Hani Benhabiles
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 13/17] monitor: Add host_net_add device argument completion Hani Benhabiles
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 14/17] readline: Make completion strings always unique Hani Benhabiles
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 15/17] monitor: Add host_net_remove arguments completion Hani Benhabiles
2014-03-30 10:58 ` [Qemu-devel] [PATCH v2 16/17] monitor: Add mouse_set index argument completion Hani Benhabiles
2014-03-30 10:58 ` Hani Benhabiles [this message]
2014-04-11 17:50 ` [Qemu-devel] [PATCH v2 00/17] monitor: Completion support for various commands Luiz Capitulino
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=1396177119-24955-18-git-send-email-kroosec@gmail.com \
--to=kroosec@gmail.com \
--cc=aliguori@amazon.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).