Commit ae4a2bd7 authored by Markus Armbruster's avatar Markus Armbruster Committed by Cornelia Huck
Browse files

s390x: Replace unchecked qdev_init() by qdev_init_nofail() 



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: default avatarMarkus Armbruster <armbru@redhat.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Message-Id: <1423128889-18260-4-git-send-email-armbru@redhat.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 7ccfb495

hw/intc/s390_flic.c

+1 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ S390FLICState *s390_get_flic(void) 
void s390_flic_init(void)

{

    DeviceState *dev;

    int r;



    dev = s390_flic_kvm_create();

    if (!dev) {
@@ -38,10 +37,7 @@ void s390_flic_init(void) 
        object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC,

                                  OBJECT(dev), NULL);

    }

    r = qdev_init(dev);

    if (r) {

        error_report("flic: couldn't create qdev");

    }

    qdev_init_nofail(dev);

}



static int qemu_s390_register_io_adapter(S390FLICState *fs, uint32_t id,