qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws
Subject: [Qemu-devel] [PULL 15/17] monitor: Add delvm and loadvm argument completion
Date: Wed, 11 Jun 2014 10:51:00 -0400	[thread overview]
Message-ID: <1402498262-20521-16-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1402498262-20521-1-git-send-email-lcapitulino@redhat.com>

From: Hani Benhabiles <kroosec@gmail.com>

Signed-off-by: Hani Benhabiles <hani@linux.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.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 f99da0e..5f1a677 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 a53ad51..2d9b0a2 100644
--- a/hmp.h
+++ b/hmp.h
@@ -112,5 +112,7 @@ void migrate_set_capability_completion(ReadLineState *rs, int nb_args,
 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 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 d6c4f85..ee9390f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -70,6 +70,7 @@
 #include "qmp-commands.h"
 #include "hmp.h"
 #include "qemu/thread.h"
+#include "block/qapi.h"
 
 /* for pic/irq_info */
 #if defined(TARGET_SPARC)
@@ -4648,6 +4649,53 @@ void host_net_remove_completion(ReadLineState *rs, int nb_args, const char *str)
     }
 }
 
+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.9.3

  parent reply	other threads:[~2014-06-11 14:51 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-11 14:50 [Qemu-devel] [PULL 00/17] QMP queue Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 01/17] dump: fill in the flat header signature more pleasingly to the eye Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 02/17] dump: simplify write_start_flat_header() Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 03/17] dump: eliminate DumpState.page_shift ("guest's page shift") Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 04/17] dump: eliminate DumpState.page_size ("guest's page size") Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 05/17] dump: select header bitness based on ELF class, not ELF architecture Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 06/17] dump: hoist lzo_init() from get_len_buf_out() to dump_init() Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 07/17] dump: simplify get_len_buf_out() Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 08/17] monitor: Add ringbuf_write and ringbuf_read argument completion Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 09/17] monitor: Add watchdog_action " Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 10/17] monitor: Add migrate_set_capability completion Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 11/17] net: Export valid host network devices list Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 12/17] monitor: Add host_net_add device argument completion Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 13/17] readline: Make completion strings always unique Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 14/17] monitor: Add host_net_remove arguments completion Luiz Capitulino
2014-06-11 14:51 ` Luiz Capitulino [this message]
2014-06-11 14:51 ` [Qemu-devel] [PULL 16/17] readline: Clear screen on form feed Luiz Capitulino
2014-06-11 14:51 ` [Qemu-devel] [PULL 17/17] json-parser: drop superfluous assignment for token variable Luiz Capitulino
2014-06-11 21:03 ` [Qemu-devel] [PULL 00/17] QMP queue Peter Maydell

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=1402498262-20521-16-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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).