Commit e25b89e5 authored by Markus Armbruster's avatar Markus Armbruster Committed by Andreas Färber
Browse files

ide/isa: Replace unchecked qdev_init() by qdev_init_nofail() 



isa_ide_init()'s callers don't check for failure.  isa_ide_init()
looks like it could fail, but since isa_ide_realizefn() can't fail, it
actually can't.  Replace its qdev_init() by qdev_init_nofail() to make
it obvious.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent c4bacafb

hw/ide/isa.c

+1 −3
Original line number Diff line number Diff line
@@ -88,9 +88,7 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, 
    qdev_prop_set_uint32(dev, "iobase",  iobase);

    qdev_prop_set_uint32(dev, "iobase2", iobase2);

    qdev_prop_set_uint32(dev, "irq",     isairq);

    if (qdev_init(dev) < 0) {

        return NULL;

    }

    qdev_init_nofail(dev);



    s = ISA_IDE(dev);

    if (hd0) {