From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52911 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUjXM-0004iT-MH for qemu-devel@nongnu.org; Fri, 02 Jul 2010 12:56:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUjVB-0004Id-71 for qemu-devel@nongnu.org; Fri, 02 Jul 2010 12:54:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2390) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUjVA-0004IE-T2 for qemu-devel@nongnu.org; Fri, 02 Jul 2010 12:54:09 -0400 From: Kevin Wolf Date: Fri, 2 Jul 2010 18:38:13 +0200 Message-Id: <1278088712-12302-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1278088712-12302-1-git-send-email-kwolf@redhat.com> References: <1278088712-12302-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 04/23] 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: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster 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 Signed-off-by: Kevin Wolf --- 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