mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-27 03:51:57 -06:00
isa: Clean up inappropriate hw_error()
isa_bus_irqs(), isa_create() and isa_try_create() call hw_error() when passed a null bus. Use of hw_error() has always been questionable, because these are used only during machine initialization, and printing CPU registers isn't useful there. Since the previous commit, passing a null bus is a programming error. Drop the hw_error() and simply let it crash. Cc: Richard Henderson <rth@twiddle.net> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: "Hervé Poussineau" <hpoussin@reactos.org> Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: Markus Armbruster <armbru@pond.sub.org> Reviewed-by: Hervé Poussineau <hpoussin@reactos.org> Message-Id: <1450354795-31608-12-git-send-email-armbru@redhat.com> Reviewed-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
parent
d10e54329b
commit
675463d9b6
1 changed files with 0 additions and 11 deletions
|
@ -63,9 +63,6 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion* address_space,
|
||||||
|
|
||||||
void isa_bus_irqs(ISABus *bus, qemu_irq *irqs)
|
void isa_bus_irqs(ISABus *bus, qemu_irq *irqs)
|
||||||
{
|
{
|
||||||
if (!bus) {
|
|
||||||
hw_error("Can't set isa irqs with no isa bus present.");
|
|
||||||
}
|
|
||||||
bus->irqs = irqs;
|
bus->irqs = irqs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -137,10 +134,6 @@ ISADevice *isa_create(ISABus *bus, const char *name)
|
||||||
{
|
{
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
|
|
||||||
if (!bus) {
|
|
||||||
hw_error("Tried to create isa device %s with no isa bus present.",
|
|
||||||
name);
|
|
||||||
}
|
|
||||||
dev = qdev_create(BUS(bus), name);
|
dev = qdev_create(BUS(bus), name);
|
||||||
return ISA_DEVICE(dev);
|
return ISA_DEVICE(dev);
|
||||||
}
|
}
|
||||||
|
@ -149,10 +142,6 @@ ISADevice *isa_try_create(ISABus *bus, const char *name)
|
||||||
{
|
{
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
|
|
||||||
if (!bus) {
|
|
||||||
hw_error("Tried to create isa device %s with no isa bus present.",
|
|
||||||
name);
|
|
||||||
}
|
|
||||||
dev = qdev_try_create(BUS(bus), name);
|
dev = qdev_try_create(BUS(bus), name);
|
||||||
return ISA_DEVICE(dev);
|
return ISA_DEVICE(dev);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue