[Qemu-devel] [PATCH] qdev: modify func qdev_build_hotpluggable_device_list

[Qemu-devel] [PATCH] qdev: modify func qdev_build_hotpluggable_device_list

[Jun Li]

Currently when *obj is not a TYPE_DEVICE, qemu will abort. This patch just
fixed it. When *obj is not a TYPE_DEVICE, just do not add it to hotpluggable
device list.

This patch also fixed the following issue:
1, boot qemu using cli:
virtio-scsi-pci,id=scsi0 -enable-kvm

2, device_del scsi0 via hmp using tab key(first input device_del, then press
"Tab" key).
(qemu) device_del

After step2, qemu will abort.
(qemu) device_del hw/core/qdev.c:930:qdev_build_hotpluggable_device_list:
Object 0x5555563a2460 is not an instance of type device

Signed-off-by: Jun Li <junmuzi@gmail.com>
---
 hw/core/qdev.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index b3d5196..2282e95 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -927,13 +927,18 @@ void qdev_alias_all_properties(DeviceState *target, Object *source)
 int qdev_build_hotpluggable_device_list(Object *obj, void *opaque)
 {
     GSList **list = opaque;
-    DeviceState *dev = DEVICE(obj);
+    DeviceState *dev = (DeviceState *)object_dynamic_cast(OBJECT(obj),
+                                                          "device");
+
+    if (dev) {
+        if (dev->realized &&
+            object_property_get_bool(obj, "hotpluggable", NULL)) {
+            *list = g_slist_append(*list, dev);
+        }
 
-    if (dev->realized && object_property_get_bool(obj, "hotpluggable", NULL)) {
-        *list = g_slist_append(*list, dev);
+        object_child_foreach(obj, qdev_build_hotpluggable_device_list, opaque);
     }
 
-    object_child_foreach(obj, qdev_build_hotpluggable_device_list, opaque);
     return 0;
 }
 
-- 
1.9.3

Re: [Qemu-devel] [PATCH] qdev: modify func qdev_build_hotpluggable_device_list

[Paolo Bonzini]

On 02/11/2014 18:21, Jun Li wrote:
> Currently when *obj is not a TYPE_DEVICE, qemu will abort. This patch just
> fixed it. When *obj is not a TYPE_DEVICE, just do not add it to hotpluggable
> device list.
> 
> This patch also fixed the following issue:
> 1, boot qemu using cli:
> virtio-scsi-pci,id=scsi0 -enable-kvm
> 
> 2, device_del scsi0 via hmp using tab key(first input device_del, then press
> "Tab" key).
> (qemu) device_del
> 
> After step2, qemu will abort.
> (qemu) device_del hw/core/qdev.c:930:qdev_build_hotpluggable_device_list:
> Object 0x5555563a2460 is not an instance of type device
> 
> Signed-off-by: Jun Li <junmuzi@gmail.com>
> ---
>  hw/core/qdev.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index b3d5196..2282e95 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -927,13 +927,18 @@ void qdev_alias_all_properties(DeviceState *target, Object *source)
>  int qdev_build_hotpluggable_device_list(Object *obj, void *opaque)
>  {
>      GSList **list = opaque;
> -    DeviceState *dev = DEVICE(obj);
> +    DeviceState *dev = (DeviceState *)object_dynamic_cast(OBJECT(obj),
> +                                                          "device");
> +
> +    if (dev) {
> +        if (dev->realized &&
> +            object_property_get_bool(obj, "hotpluggable", NULL)) {
> +            *list = g_slist_append(*list, dev);
> +        }
>  
> -    if (dev->realized && object_property_get_bool(obj, "hotpluggable", NULL)) {
> -        *list = g_slist_append(*list, dev);
> +        object_child_foreach(obj, qdev_build_hotpluggable_device_list, opaque);
>      }
>  
> -    object_child_foreach(obj, qdev_build_hotpluggable_device_list, opaque);

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>