Commit fa12fbbe authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

ide: Make it explicit that ide_create_drive() can't fail 



All callers of ide_create_drive() ignore its value.  Currently
harmless, because it fails only when qdev_init() fails, which fails
only when ide_drive_initfn() fails, which never fails.

Brittle.  Change it to die instead of silently ignoring failure.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent fa66b909

hw/ide/qdev.c

+1 −2
Original line number Diff line number Diff line
@@ -84,8 +84,7 @@ IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive) 
    dev = qdev_create(&bus->qbus, "ide-drive");

    qdev_prop_set_uint32(dev, "unit", unit);

    qdev_prop_set_drive(dev, "drive", drive);

    if (qdev_init(dev) < 0)

        return NULL;

    qdev_init_nofail(dev);

    return DO_UPCAST(IDEDevice, qdev, dev);

}