[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/41] sysbus: Don't use hw_error() in machine_init_d
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 11/41] sysbus: Don't use hw_error() in machine_init_done_notifiers |
Date: |
Wed, 13 Jan 2016 16:43:09 +0100 |
platform_bus_map_irq() and platform_bus_map_mmio() use hw_error() to
fail. They run in machine_init_done_notifiers, via
platform_bus_init_notify() and link_sysbus_device(). Printing CPU
registers is not helpful there.
Replace hw_error() by error_report(); exit(1). If these are
programming errors, it should be replaced by an assertion instead.
While there, observe that both functions always return 0, and
link_sysbus_device() ignores the return value. Change them to void.
Cc: Alexander Graf <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
---
hw/core/platform-bus.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c
index 70e0518..aa55d01 100644
--- a/hw/core/platform-bus.c
+++ b/hw/core/platform-bus.c
@@ -21,6 +21,7 @@
#include "hw/platform-bus.h"
#include "exec/address-spaces.h"
+#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
@@ -106,31 +107,29 @@ static void plaform_bus_refresh_irqs(PlatformBusDevice
*pbus)
pbus->done_gathering = true;
}
-static int platform_bus_map_irq(PlatformBusDevice *pbus, SysBusDevice *sbdev,
- int n)
+static void platform_bus_map_irq(PlatformBusDevice *pbus, SysBusDevice *sbdev,
+ int n)
{
int max_irqs = pbus->num_irqs;
int irqn;
if (sysbus_is_irq_connected(sbdev, n)) {
/* IRQ is already mapped, nothing to do */
- return 0;
+ return;
}
irqn = find_first_zero_bit(pbus->used_irqs, max_irqs);
if (irqn >= max_irqs) {
- hw_error("Platform Bus: Can not fit IRQ line");
- return -1;
+ error_report("Platform Bus: Can not fit IRQ line");
+ exit(1);
}
set_bit(irqn, pbus->used_irqs);
sysbus_connect_irq(sbdev, n, pbus->irqs[irqn]);
-
- return 0;
}
-static int platform_bus_map_mmio(PlatformBusDevice *pbus, SysBusDevice *sbdev,
- int n)
+static void platform_bus_map_mmio(PlatformBusDevice *pbus, SysBusDevice *sbdev,
+ int n)
{
MemoryRegion *sbdev_mr = sysbus_mmio_get_region(sbdev, n);
uint64_t size = memory_region_size(sbdev_mr);
@@ -140,7 +139,7 @@ static int platform_bus_map_mmio(PlatformBusDevice *pbus,
SysBusDevice *sbdev,
if (memory_region_is_mapped(sbdev_mr)) {
/* Region is already mapped, nothing to do */
- return 0;
+ return;
}
/*
@@ -155,13 +154,13 @@ static int platform_bus_map_mmio(PlatformBusDevice *pbus,
SysBusDevice *sbdev,
}
if (!found_region) {
- hw_error("Platform Bus: Can not fit MMIO region of size %"PRIx64,
size);
+ error_report("Platform Bus: Can not fit MMIO region of size %"PRIx64,
+ size);
+ exit(1);
}
/* Map the device's region into our Platform Bus MMIO space */
memory_region_add_subregion(&pbus->mmio, off, sbdev_mr);
-
- return 0;
}
/*
--
2.4.3
- [Qemu-devel] [PULL 15/41] audio: Clean up inappropriate and unreachable use of hw_error(), (continued)
- [Qemu-devel] [PULL 15/41] audio: Clean up inappropriate and unreachable use of hw_error(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 24/41] test-throttle: Simplify qemu_init_main_loop() error handling, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 20/41] error: Use error_report_err() instead of ad hoc prints, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 13/41] isa: Clean up error handling around isa_bus_new(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 18/41] error: Use error_report_err() where appropriate (again), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 21/41] error: Improve documentation, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 36/41] vhdx: Fix "log that needs to be replayed" error message, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 02/41] Use error_fatal to simplify obvious fatal errors, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 05/41] omap: Don't use hw_error() in device init() methods, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 07/41] etraxfs_eth: Don't use hw_error() in init() method, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 11/41] sysbus: Don't use hw_error() in machine_init_done_notifiers,
Markus Armbruster <=
- [Qemu-devel] [PULL 17/41] qemu-nbd: Replace BSDism <err.h> by error_report(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 28/41] error: Use error_prepend() where it makes obvious sense, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 19/41] error: Use error_report_err() instead of monitor_printf(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 35/41] pci-assign: Clean up "Failed to assign" error messages, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 06/41] arm_mptimer: Don't use hw_error() in realize() method, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 14/41] isa: Clean up inappropriate hw_error(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 23/41] qemu-nbd: Clean up "Failed to load snapshot" error message, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 12/41] isa: Trivially convert remaining PCI-ISA bridges to realize(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 16/41] xen-hvm: Mark inappropriate error handling FIXME, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 25/41] error: New error_prepend(), error_reportf_err(), Markus Armbruster, 2016/01/13