Received: from [140.186.70.92] (port=34136 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POTSF-0006pi-L6 for qemu-devel@nongnu.org; Fri, 03 Dec 2010 06:05:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POTSA-0001He-9o for qemu-devel@nongnu.org; Fri, 03 Dec 2010 06:05:31 -0500 Received: from mel.act-europe.fr ([194.98.77.210]:55980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POTSA-0001AZ-5a for qemu-devel@nongnu.org; Fri, 03 Dec 2010 06:05:26 -0500 From: Tristan Gingold Date: Fri, 3 Dec 2010 12:05:03 +0100 Message-Id: <1291374303-86114-1-git-send-email-gingold@adacore.com> Subject: [Qemu-devel] [PATCH] isa-bus.c: use hw_error instead of fprintf List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.orgqemu-devel@nongnu.org Cc: Tristan Gingold 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 --- 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 4e306de..3a6c961 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); -- 1.7.3.GIT