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: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
master
Markus Armbruster 2010-06-25 18:53:22 +02:00 committed by Kevin Wolf
parent fa66b909f3
commit fa12fbbece
1 changed files with 1 additions and 2 deletions

View File

@ -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);
}