From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJ3pa-00067A-1q for qemu-devel@nongnu.org; Wed, 04 Feb 2015 12:33:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJ3pV-0004KN-3m for qemu-devel@nongnu.org; Wed, 04 Feb 2015 12:33:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJ3pU-0004Jp-RI for qemu-devel@nongnu.org; Wed, 04 Feb 2015 12:33:33 -0500 From: Markus Armbruster Date: Wed, 4 Feb 2015 18:33:06 +0100 Message-Id: <1423071188-1085-7-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 6/8] serial: serial_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" , Blue Swirl , Anthony Liguori , Leon Alrae , afaerber@suse.de, Aurelien Jarno , Richard Henderson It shouldn't fail, and no caller checks for failure. Make failure fatal. Maintainers of affected machines cc'ed. Cc: Richard Henderson Cc: Anthony Liguori Cc: "Michael S. Tsirkin" Cc: Aurelien Jarno Cc: Leon Alrae Cc: Blue Swirl Signed-off-by: Markus Armbruster --- hw/char/serial-isa.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index 059ceb8..f3db024 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -119,22 +119,16 @@ static void serial_register_types(void) type_init(serial_register_types) -static bool serial_isa_init(ISABus *bus, int index, CharDriverState *chr) +static void serial_isa_init(ISABus *bus, int index, CharDriverState *chr) { DeviceState *dev; ISADevice *isadev; - isadev = isa_try_create(bus, TYPE_ISA_SERIAL); - if (!isadev) { - return false; - } + isadev = isa_create(bus, TYPE_ISA_SERIAL); dev = 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); } void serial_hds_isa_init(ISABus *bus, int n) -- 1.9.3