From: Markus Armbruster <armbru@redhat.com>
Date: Fri, 25 Jun 2010 16:53:22 +0000 (+0200)
Subject: ide: Make it explicit that ide_create_drive() can't fail
X-Git-Tag: v0.13.0-rc0~109^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa12fbbecefc6f9bf20374daa275a598096d113c;p=thirdparty%2Fqemu.git

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>
---

diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 0f9f22e30f1..127478ba657 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -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);
 }