From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQGFN-0003dO-F6 for qemu-devel@nongnu.org; Tue, 24 Feb 2015 09:14:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQGFI-0004nH-01 for qemu-devel@nongnu.org; Tue, 24 Feb 2015 09:14:01 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45944 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQGFH-0004n1-Q9 for qemu-devel@nongnu.org; Tue, 24 Feb 2015 09:13:55 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 24 Feb 2015 14:58:30 +0100 Message-Id: <1424786311-22387-11-git-send-email-afaerber@suse.de> In-Reply-To: <1424786311-22387-1-git-send-email-afaerber@suse.de> References: <1424786311-22387-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 10/10] parallel: parallel_hds_isa_init() shouldn't fail List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Markus Armbruster , Blue Swirl , Anthony Liguori , Leon Alrae , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno From: Markus Armbruster It shouldn't fail, and no caller checks for failure. Make failure fatal. Maintainers of affected machines cc'ed. Cc: Anthony Liguori Cc: "Michael S. Tsirkin" Cc: Aurelien Jarno Cc: Leon Alrae Cc: Blue Swirl Signed-off-by: Markus Armbruster Signed-off-by: Andreas F=C3=A4rber --- hw/char/parallel.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 710cefc..4079554 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -642,22 +642,16 @@ static void parallel_register_types(void) =20 type_init(parallel_register_types) =20 -static bool parallel_init(ISABus *bus, int index, CharDriverState *chr) +static void parallel_init(ISABus *bus, int index, CharDriverState *chr) { DeviceState *dev; ISADevice *isadev; =20 - isadev =3D isa_try_create(bus, "isa-parallel"); - if (!isadev) { - return false; - } + isadev =3D isa_create(bus, "isa-parallel"); dev =3D DEVICE(isadev); qdev_prop_set_uint32(dev, "index", index); qdev_prop_set_chr(dev, "chardev", chr); - if (qdev_init(dev) < 0) { - return false; - } - return true; + qdev_init_nofail(dev); } =20 void parallel_hds_isa_init(ISABus *bus, int n) --=20 2.1.4