david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390x: Replace unchecked qdev_init() by qdev_init_nofail()

Browse Source 
s390_flic_init() is a helper to create and realize either
"s390-flic-kvm" or "s390-flic-qemu".  When qdev_init() fails, it
complains to stderr and succeeds.

Except it can't actually fail, because the "s390-flic-qemu" is a dummy
without a realize method, and "s390-flic-kvm"'s realize can't fail,
even when the kernel device is really unavailable.  Odd.

Replace qdev_init() by qdev_init_nofail() to make "can't fail" locally
obvious, and get rid of the unreachable error reporting.

Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Message-Id: <1423128889-18260-4-git-send-email-armbru@redhat.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
Markus Armbruster 2015-02-05 10:34:49 +01:00 committed by Cornelia Huck
parent 7ccfb495c6
commit ae4a2bd759
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/intc/s390_flic.c
View File

@ -30,7 +30,6 @@ S390FLICState *s390_get_flic(void)
void s390_flic_init(void) void s390_flic_init(void)
{ {
DeviceState *dev; DeviceState *dev;
int r;
dev = s390_flic_kvm_create(); dev = s390_flic_kvm_create();
if (!dev) { if (!dev) {
@ -38,10 +37,7 @@ void s390_flic_init(void)
object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC, object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC,
OBJECT(dev), NULL); OBJECT(dev), NULL);
} }
r = qdev_init(dev); qdev_init_nofail(dev);
if (r) {
error_report("flic: couldn't create qdev");
}
} }
static int qemu_s390_register_io_adapter(S390FLICState *fs, uint32_t id, static int qemu_s390_register_io_adapter(S390FLICState *fs, uint32_t id,