diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-02-04 18:33:08 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-02-24 00:19:06 +0100 |
| commit | 4bc6a3e54e06c47b8e23bfa3d873fa2f42dfec02 (patch) | |
| tree | 5d3e3fedae0cbf85af72cf3b353316150e1880be | |
| parent | 07dc788054d714a07df08e2eacc8c2e1c47b9a58 (diff) | |
| download | qemu-4bc6a3e54e06c47b8e23bfa3d873fa2f42dfec02.zip | |
parallel: parallel_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: 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>
| -rw-r--r-- | hw/char/parallel.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 710cefcd94..4079554bb9 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -642,22 +642,16 @@ static void parallel_register_types(void) type_init(parallel_register_types) -static bool parallel_init(ISABus *bus, int index, CharDriverState *chr) +static void parallel_init(ISABus *bus, int index, CharDriverState *chr) { DeviceState *dev; ISADevice *isadev; - isadev = isa_try_create(bus, "isa-parallel"); - if (!isadev) { - return false; - } + isadev = isa_create(bus, "isa-parallel"); 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 parallel_hds_isa_init(ISABus *bus, int n) |