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>
This commit is contained in:
parent
07dc788054
commit
4bc6a3e54e
|
@ -642,22 +642,16 @@ static void parallel_register_types(void)
|
||||||
|
|
||||||
type_init(parallel_register_types)
|
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;
|
DeviceState *dev;
|
||||||
ISADevice *isadev;
|
ISADevice *isadev;
|
||||||
|
|
||||||
isadev = isa_try_create(bus, "isa-parallel");
|
isadev = isa_create(bus, "isa-parallel");
|
||||||
if (!isadev) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
dev = DEVICE(isadev);
|
dev = DEVICE(isadev);
|
||||||
qdev_prop_set_uint32(dev, "index", index);
|
qdev_prop_set_uint32(dev, "index", index);
|
||||||
qdev_prop_set_chr(dev, "chardev", chr);
|
qdev_prop_set_chr(dev, "chardev", chr);
|
||||||
if (qdev_init(dev) < 0) {
|
qdev_init_nofail(dev);
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void parallel_hds_isa_init(ISABus *bus, int n)
|
void parallel_hds_isa_init(ISABus *bus, int n)
|
||||||
|
|
Loading…
Reference in a new issue