[Qemu-devel] [PATCH v2 0/2] monitor: add peripheral device del completion support

[Qemu-devel] [PATCH v2 0/2] monitor: add peripheral device del completion support

[Zhu Guihua]

After inputting device_del command in monitor, we expect to list all
hotpluggable devices automatically by pressing tab key. This patchset provides
the function to list all peripheral devices such as memory devices.

v2:
- use object_child_foreach() to simplify the implementation (Andreas)

Zhu Guihua (2):
  qdev: add list built for devices
  monitor: add del completion for peripheral device

 hw/core/qdev.c         | 13 +++++++++++++
 include/hw/qdev-core.h |  2 ++
 monitor.c              | 23 +++++++++++++++++++++++
 3 files changed, 38 insertions(+)

-- 
1.9.3

[Qemu-devel] [PATCH v2 1/2] qdev: add list built for devices

[Zhu Guihua]

For peripheral device del completion, add a function to build a list for
devices.

Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
 hw/core/qdev.c         | 13 +++++++++++++
 include/hw/qdev-core.h |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index fcb1638..041ac38 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -1074,6 +1074,19 @@ void device_reset(DeviceState *dev)
     }
 }
 
+int device_built_list(Object *obj, void *opaque)
+{
+    GSList **list = opaque;
+    DeviceState *dev = DEVICE(obj);
+
+    if (dev->realized) {
+        *list = g_slist_append(*list, dev);
+    }
+
+    return 0;
+
+}
+
 Object *qdev_get_machine(void)
 {
     static Object *dev;
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 178fee2..3c30837 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -348,6 +348,8 @@ void qdev_machine_init(void);
  */
 void device_reset(DeviceState *dev);
 
+int device_built_list(Object *obj, void *opaque);
+
 const struct VMStateDescription *qdev_get_vmsd(DeviceState *dev);
 
 const char *qdev_fw_name(DeviceState *dev);
-- 
1.9.3

Re: [Qemu-devel] [PATCH v2 1/2] qdev: add list built for devices

[Igor Mammedov]

On Tue, 30 Sep 2014 17:40:34 +0800
Zhu Guihua <zhugh.fnst@cn.fujitsu.com> wrote:

rephrase subj to
 qdev: func_name() helper


> For peripheral device del completion, add a function to build a list for
> devices.
> 
> Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
> ---
>  hw/core/qdev.c         | 13 +++++++++++++
>  include/hw/qdev-core.h |  2 ++
>  2 files changed, 15 insertions(+)
> 
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index fcb1638..041ac38 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -1074,6 +1074,19 @@ void device_reset(DeviceState *dev)
>      }
>  }
>  
> +int device_built_list(Object *obj, void *opaque)
qdev_build_hotpluggable_device_list()
might describe better what function does

You can put object_child_foreach(peripheral, device_built_list, &list)
inside if this callback, see for example qmp_pc_dimm_device_list()

Also function would return ALL devices regardless of
whether they are hotpluggable or not.
"hotpluggable" property can be used to discard non hotpluggable devices.


> +{
> +    GSList **list = opaque;
> +    DeviceState *dev = DEVICE(obj);
> +
> +    if (dev->realized) {
> +        *list = g_slist_append(*list, dev);
> +    }
> +
> +    return 0;
> +
> +}
> +
>  Object *qdev_get_machine(void)
>  {
>      static Object *dev;
> diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
> index 178fee2..3c30837 100644
> --- a/include/hw/qdev-core.h
> +++ b/include/hw/qdev-core.h
> @@ -348,6 +348,8 @@ void qdev_machine_init(void);
>   */
>  void device_reset(DeviceState *dev);
>  
> +int device_built_list(Object *obj, void *opaque);
> +
>  const struct VMStateDescription *qdev_get_vmsd(DeviceState *dev);
>  
>  const char *qdev_fw_name(DeviceState *dev);

[Qemu-devel] [PATCH v2 2/2] monitor: add del completion for peripheral device

[Zhu Guihua]

Add peripheral_device_del_completion() to let peripheral device del completion
be possible.

Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
 monitor.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/monitor.c b/monitor.c
index 667efb7..55f4466 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4351,6 +4351,28 @@ 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, device_built_list, &list);
+
+    for (item = list; item; item = g_slist_next(item)) {
+        DeviceState *dev = item->data;
+        if (!strncmp(str, dev->id, len)) {
+            readline_add_completion(rs, dev->id);
+        }
+    }
+}
+
 void chardev_remove_completion(ReadLineState *rs, int nb_args, const char *str)
 {
     size_t len;
@@ -4424,6 +4446,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