From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJ3pI-0005dz-3K for qemu-devel@nongnu.org; Wed, 04 Feb 2015 12:33:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJ3pB-0004FC-VX for qemu-devel@nongnu.org; Wed, 04 Feb 2015 12:33:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52825) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJ3pB-0004Ex-OK for qemu-devel@nongnu.org; Wed, 04 Feb 2015 12:33:13 -0500 From: Markus Armbruster Date: Wed, 4 Feb 2015 18:33:02 +0100 Message-Id: <1423071188-1085-3-git-send-email-armbru@redhat.com> In-Reply-To: <1423071188-1085-1-git-send-email-armbru@redhat.com> References: <1423071188-1085-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 2/8] ide/isa: Replace unchecked qdev_init() by qdev_init_nofail() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , afaerber@suse.de, Stefan Hajnoczi isa_ide_init()'s callers don't check for failure. isa_ide_init() looks like it could fail, but since isa_ide_realizefn() can't fail, it actually can't. Replace its qdev_init() by qdev_init_nofail() to make it obvious. Cc: Kevin Wolf Cc: Stefan Hajnoczi Signed-off-by: Markus Armbruster --- hw/ide/isa.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/ide/isa.c b/hw/ide/isa.c index b084162..c0c4e1b 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -88,9 +88,7 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, qdev_prop_set_uint32(dev, "iobase", iobase); qdev_prop_set_uint32(dev, "iobase2", iobase2); qdev_prop_set_uint32(dev, "irq", isairq); - if (qdev_init(dev) < 0) { - return NULL; - } + qdev_init_nofail(dev); s = ISA_IDE(dev); if (hd0) { -- 1.9.3