isa-bus.c: use hw_error instead of fprintf
PATCH 1/1 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 <[email protected]>
--- hw/isa-bus.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-)
hw/isa-bus.c +4 -7
@@ -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);
Signature · 1 line
1.7.3.GIT
Blue Swirl
AppliedThanks, applied.
Quoted 51 lines · Tristan Gingold
Minor clean-up in
isa-bus.c. Usinghw_erroris more consistent. There is a difference however:hw_errordumps the cpu state.Signed-off-by Tristan Gingold <[email protected]>---
hw/isa-bus.c | 11 ++++-------1 files changed, 4 insertions(+), 7 deletions(-)hw/isa-bus.c +4
-8@@ -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); --1.7.3.GIT