From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44299 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSCvc-0002Hf-Lx for qemu-devel@nongnu.org; Fri, 25 Jun 2010 13:43:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OSC9o-0008Lr-63 for qemu-devel@nongnu.org; Fri, 25 Jun 2010 12:53:38 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:34407) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OSC9n-0008F7-W2 for qemu-devel@nongnu.org; Fri, 25 Jun 2010 12:53:36 -0400 From: Markus Armbruster Date: Fri, 25 Jun 2010 18:53:22 +0200 Message-Id: <1277484812-22012-3-git-send-email-armbru@redhat.com> In-Reply-To: <1277484812-22012-1-git-send-email-armbru@redhat.com> References: <1277484812-22012-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 02/12] ide: Make it explicit that ide_create_drive() can't fail List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, kraxel@redhat.com, hch@lst.de 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 --- hw/ide/qdev.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 0f9f22e..127478b 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); } -- 1.6.6.1