From: Jun Li <junmuzi@gmail.com>
Date: Wed, 5 Nov 2014 07:03:03 +0000 (+0800)
Subject: qdev: Avoid type assertion in qdev_build_hotpluggable_device_list()
X-Git-Tag: qemu-xen-4.6.0-rc1~34^2~8
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4ec1b9b159b79cf391753ef19aeff2236a6c099c;p=qemu-upstream-unstable.git

qdev: Avoid type assertion in qdev_build_hotpluggable_device_list()

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

This patch also fixes the following issue:
1. boot QEMU using cli:
$ /opt/qemu-git-arm/bin/qemu-system-x86_64 -monitor stdio -enable-kvm \
-device virtio-scsi-pci,id=scsi0

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

After step 2, 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>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Andreas Färber <afaerber@suse.de>
(cherry picked from commit 09d560177101d2ef1e333754a25cfa49b70583b3)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 35fd00d26..ef06aa4d4 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -938,7 +938,12 @@ void qdev_alias_all_properties(DeviceState *target, Object *source)
 static int qdev_add_hotpluggable_device(Object *obj, void *opaque)
 {
     GSList **list = opaque;
-    DeviceState *dev = DEVICE(obj);
+    DeviceState *dev = (DeviceState *)object_dynamic_cast(OBJECT(obj),
+                                                          TYPE_DEVICE);
+
+    if (dev == NULL) {
+        return 0;
+    }
 
     if (dev->realized && object_property_get_bool(obj, "hotpluggable", NULL)) {
         *list = g_slist_append(*list, dev);