diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-02-04 18:33:06 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-02-24 00:19:06 +0100 |
| commit | c6f10a5876a81f7a016714df06730c48210ee419 (patch) | |
| tree | db6a950d115b95a0a6e1817728b0db8a3d16247d /hw/char/serial-isa.c | |
| parent | b6607a1a204d52fe13746cc9c3d2da4303e39b18 (diff) | |
| download | qemu-c6f10a5876a81f7a016714df06730c48210ee419.zip qemu-c6f10a5876a81f7a016714df06730c48210ee419.tar.gz qemu-c6f10a5876a81f7a016714df06730c48210ee419.tar.bz2 | |
serial: serial_hds_isa_init() shouldn't fail
It shouldn't fail, and no caller checks for failure. Make failure
fatal.
Maintainers of affected machines cc'ed.
Cc: Richard Henderson <rth@twiddle.net>
Cc: Anthony Liguori <aliguori@amazon.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/char/serial-isa.c')
| -rw-r--r-- | hw/char/serial-isa.c | 12 |
1 files 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) |