From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlY2C-00034j-50 for qemu-devel@nongnu.org; Tue, 04 Nov 2014 01:56:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlY23-0000c1-0a for qemu-devel@nongnu.org; Tue, 04 Nov 2014 01:56:08 -0500 Received: from mail-pa0-x229.google.com ([2607:f8b0:400e:c03::229]:44795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlY22-0000bu-PI for qemu-devel@nongnu.org; Tue, 04 Nov 2014 01:55:58 -0500 Received: by mail-pa0-f41.google.com with SMTP id rd3so13887732pab.28 for ; Mon, 03 Nov 2014 22:55:57 -0800 (PST) From: Jun Li Date: Tue, 4 Nov 2014 14:55:47 +0800 Message-Id: <1415084147-11895-1-git-send-email-junmuzi@gmail.com> Subject: [Qemu-devel] [PATCH v2] qdev: modify func qdev_build_hotpluggable_device_list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.crosthwaite@xilinx.com, famz@redhat.com, mst@redhat.com, juli@redhat.com, imammedo@redhat.com, pbonzini@redhat.com, Jun Li , afaerber@suse.de 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: $ /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 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 Reviewed-by: Paolo Bonzini --- v2: This version just do a little changes for the commit message. As following show: In v1, 1, boot qemu using cli: virtio-scsi-pci,id=scsi0 -enable-kvm In v2, 1, boot qemu using cli: $ /opt/qemu-git-arm/bin/qemu-system-x86_64 -monitor stdio -enable-kvm \ -device virtio-scsi-pci,id=scsi0 --- 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