Yes, in my original thought i just want to do as you said. But it will have two "return 0" in one function. So i think it's not so smart. If you still think two "return 0" is better, i will submit a new version. Thanks.
BTW, for subject, i agree with you. Jun Li 2014-11-5 上午2:39于 "Andreas Färber" <afaer...@suse.de>写道: > Hi, > > Am 04.11.2014 um 07:55 schrieb 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: > > $ /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 <junm...@gmail.com> > > Reviewed-by: Paolo Bonzini <pbonz...@redhat.com> > > --- > > 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(-) > > Thanks, I've queued this patch, but we should give it a more meaningful > subject - maybe "qdev: Avoid type assertion in qdev_build_...()"? > > Also, we could avoid reindentation by returning early: > if (dev == NULL) { > return 0; > } > > What do you think? > > Regards, > Andreas > > -- > SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 21284 AG Nürnberg >