From: Luiz Capitulino <lcapitulino@redhat.com>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 6/7] monitor: add del completion for peripheral device
Date: Thu, 23 Oct 2014 11:19:49 -0400	[thread overview]
Message-ID: <1414077590-18036-7-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1414077590-18036-1-git-send-email-lcapitulino@redhat.com>
From: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Add peripheral_device_del_completion() to let peripheral device del completion
be possible.
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
diff --git a/monitor.c b/monitor.c
index fba4ce2..e3799f9 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4341,6 +4341,31 @@ static void device_del_bus_completion(ReadLineState *rs,  BusState *bus,
     }
 }
 
+static void peripheral_device_del_completion(ReadLineState *rs,
+                                             const char *str, size_t len)
+{
+    Object *peripheral;
+    GSList *list = NULL, *item;
+
+    peripheral = object_resolve_path("/machine/peripheral/", NULL);
+    if (peripheral == NULL) {
+        return;
+    }
+
+    object_child_foreach(peripheral, qdev_build_hotpluggable_device_list,
+                         &list);
+
+    for (item = list; item; item = g_slist_next(item)) {
+        DeviceState *dev = item->data;
+
+        if (dev->id && !strncmp(str, dev->id, len)) {
+            readline_add_completion(rs, dev->id);
+        }
+    }
+
+    g_slist_free(list);
+}
+
 void chardev_remove_completion(ReadLineState *rs, int nb_args, const char *str)
 {
     size_t len;
@@ -4414,6 +4439,7 @@ void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
     len = strlen(str);
     readline_set_completion_index(rs, len);
     device_del_bus_completion(rs, sysbus_get_default(), str, len);
+    peripheral_device_del_completion(rs, str, len);
 }
 
 void object_del_completion(ReadLineState *rs, int nb_args, const char *str)
-- 
1.9.3
next prev parent reply	other threads:[~2014-10-23 15:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-23 15:19 [Qemu-devel] [PULL 0/7] QMP queue Luiz Capitulino
2014-10-23 15:19 ` [Qemu-devel] [PULL 1/7] virtio-balloon: Tweak recent fix for integer overflow Luiz Capitulino
2014-10-23 15:19 ` [Qemu-devel] [PULL 2/7] dump: Propagate errors into qmp_dump_guest_memory() Luiz Capitulino
2014-10-23 15:19 ` [Qemu-devel] [PULL 3/7] dump: Turn some functions to void to make code cleaner Luiz Capitulino
2014-10-23 15:19 ` [Qemu-devel] [PULL 4/7] MAINTAINERS: add entry for qobject files Luiz Capitulino
2014-10-23 15:19 ` [Qemu-devel] [PULL 5/7] qdev: add qdev_build_hotpluggable_device_list helper Luiz Capitulino
2014-10-23 15:19 ` Luiz Capitulino [this message]
2014-10-23 15:19 ` [Qemu-devel] [PULL 7/7] monitor: delete device_del_bus_completion Luiz Capitulino
2014-10-23 18:19 ` [Qemu-devel] [PULL 0/7] 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=1414077590-18036-7-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --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).