diff options
| author | Tristan Gingold <gingold@adacore.com> | 2010-12-03 12:05:03 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-12-11 18:34:15 +0000 |
| commit | 74782223de16e30940630b2bdb488e650ece6cd4 (patch) | |
| tree | 60eca4e796ec4ba06463a9c290e2c520a490b561 /hw/isa-bus.c | |
| parent | 34557491911f8977b5863628b1b6f5a9c95f9c29 (diff) | |
| download | focaccia-qemu-74782223de16e30940630b2bdb488e650ece6cd4.tar.gz focaccia-qemu-74782223de16e30940630b2bdb488e650ece6cd4.zip | |
isa-bus.c: use hw_error instead of fprintf
Minor clean-up in isa-bus.c. Using hw_error is more consistent. There is a difference however: hw_error dumps the cpu state. Signed-off-by: Tristan Gingold <gingold@adacore.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/isa-bus.c')
| -rw-r--r-- | hw/isa-bus.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 4e306de9cf..3a6c961343 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -68,12 +68,10 @@ void isa_bus_irqs(qemu_irq *irqs) qemu_irq isa_reserve_irq(int isairq) { if (isairq < 0 || isairq > 15) { - fprintf(stderr, "isa irq %d invalid\n", isairq); - exit(1); + hw_error("isa irq %d invalid", isairq); } if (isabus->assigned & (1 << isairq)) { - fprintf(stderr, "isa irq %d already assigned\n", isairq); - exit(1); + hw_error("isa irq %d already assigned", isairq); } isabus->assigned |= (1 << isairq); return isabus->irqs[isairq]; @@ -83,8 +81,7 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq) { assert(dev->nirqs < ARRAY_SIZE(dev->isairq)); if (isabus->assigned & (1 << isairq)) { - fprintf(stderr, "isa irq %d already assigned\n", isairq); - exit(1); + hw_error("isa irq %d already assigned", isairq); } isabus->assigned |= (1 << isairq); dev->isairq[dev->nirqs] = isairq; @@ -115,7 +112,7 @@ ISADevice *isa_create(const char *name) DeviceState *dev; if (!isabus) { - hw_error("Tried to create isa device %s with no isa bus present.\n", + hw_error("Tried to create isa device %s with no isa bus present.", name); } dev = qdev_create(&isabus->qbus, name); |