From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlKAZ-0008Se-D3 for qemu-devel@nongnu.org; Mon, 03 Nov 2014 11:07:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlKAT-00040C-9J for qemu-devel@nongnu.org; Mon, 03 Nov 2014 11:07:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlKAT-000408-1a for qemu-devel@nongnu.org; Mon, 03 Nov 2014 11:07:45 -0500 Message-ID: <5457A846.3060203@redhat.com> Date: Mon, 03 Nov 2014 17:07:34 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1414948872-25736-1-git-send-email-junmuzi@gmail.com> In-Reply-To: <1414948872-25736-1-git-send-email-junmuzi@gmail.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] qdev: modify func qdev_build_hotpluggable_device_list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jun Li , qemu-devel@nongnu.org Cc: peter.crosthwaite@xilinx.com, famz@redhat.com, mst@redhat.com, juli@redhat.com, imammedo@redhat.com, afaerber@suse.de 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 > --- > 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