ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tristan Gingold 2010-12-03 12:05:03 +01:00 committed by Blue Swirl
parent 3455749191
commit 74782223de
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/isa-bus.c
View File

@ -68,12 +68,10 @@ void isa_bus_irqs(qemu_irq *irqs)
qemu_irq isa_reserve_irq(int isairq) qemu_irq isa_reserve_irq(int isairq)
{ {
if (isairq < 0 || isairq > 15) { if (isairq < 0 || isairq > 15) {
fprintf(stderr, "isa irq %d invalid\n", isairq); hw_error("isa irq %d invalid", isairq);
exit(1);
} }
if (isabus->assigned & (1 << isairq)) { if (isabus->assigned & (1 << isairq)) {
fprintf(stderr, "isa irq %d already assigned\n", isairq); hw_error("isa irq %d already assigned", isairq);
exit(1);
} }
isabus->assigned |= (1 << isairq); isabus->assigned |= (1 << isairq);
return isabus->irqs[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)); assert(dev->nirqs < ARRAY_SIZE(dev->isairq));
if (isabus->assigned & (1 << isairq)) { if (isabus->assigned & (1 << isairq)) {
fprintf(stderr, "isa irq %d already assigned\n", isairq); hw_error("isa irq %d already assigned", isairq);
exit(1);
} }
isabus->assigned |= (1 << isairq); isabus->assigned |= (1 << isairq);
dev->isairq[dev->nirqs] = isairq; dev->isairq[dev->nirqs] = isairq;
@ -115,7 +112,7 @@ ISADevice *isa_create(const char *name)
DeviceState *dev; DeviceState *dev;
if (!isabus) { 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); name);
} }
dev = qdev_create(&isabus->qbus, name); dev = qdev_create(&isabus->qbus, name);