[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/8] serial: serial_hds_isa_init() shouldn't fail
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 6/8] serial: serial_hds_isa_init() shouldn't fail |
Date: |
Wed, 4 Feb 2015 18:33:06 +0100 |
It shouldn't fail, and no caller checks for failure. Make failure
fatal.
Maintainers of affected machines cc'ed.
Cc: Richard Henderson <address@hidden>
Cc: Anthony Liguori <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Aurelien Jarno <address@hidden>
Cc: Leon Alrae <address@hidden>
Cc: Blue Swirl <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
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
- [Qemu-devel] [PATCH 0/8] Cleanups around unchecked qdev_init(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 1/8] qdev: Improve qdev_init_nofail()'s error reporting, Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 2/8] ide/isa: Replace unchecked qdev_init() by qdev_init_nofail(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 3/8] leon3: Replace unchecked qdev_init() by qdev_init_nofail(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 4/8] etsec: Replace qdev_init() by qdev_init_nofail(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 6/8] serial: serial_hds_isa_init() shouldn't fail,
Markus Armbruster <=
- [Qemu-devel] [PATCH 8/8] parallel: parallel_hds_isa_init() shouldn't fail, Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 7/8] parallel: Factor out common parallel_hds_isa_init(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 5/8] serial: Factor out common serial_hds_isa_init(), Markus Armbruster, 2015/02/04