[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/13] arm_mptimer: Don't use hw_error() in reali
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 03/13] arm_mptimer: Don't use hw_error() in realize() method |
Date: |
Thu, 17 Dec 2015 13:19:45 +0100 |
Device realize() methods aren't supposed to call hw_error(), they
should set an error and fail cleanly. Do that.
Cc: Peter Maydell <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
hw/timer/arm_mptimer.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index 3e59c2a..5dfab66 100644
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -220,8 +220,9 @@ static void arm_mptimer_realize(DeviceState *dev, Error
**errp)
int i;
if (s->num_cpu < 1 || s->num_cpu > ARM_MPTIMER_MAX_CPUS) {
- hw_error("%s: num-cpu must be between 1 and %d\n",
- __func__, ARM_MPTIMER_MAX_CPUS);
+ error_setg(errp, "num-cpu must be between 1 and %d",
+ ARM_MPTIMER_MAX_CPUS);
+ return;
}
/* We implement one timer block per CPU, and expose multiple MMIO regions:
* * region 0 is "timer for this core"
--
2.4.3
- [Qemu-devel] [PATCH v2 11/13] isa: Clean up inappropriate hw_error(), (continued)
- [Qemu-devel] [PATCH v2 10/13] isa: Clean up error handling around isa_bus_new(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v2 08/13] sysbus: Don't use hw_error() in machine_init_done_notifiers, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v2 13/13] xen-hvm: Mark inappropriate error handling FIXME, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v2 03/13] arm_mptimer: Don't use hw_error() in realize() method,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 01/13] hw: Don't use hw_error() for machine initialization errors, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v2 07/13] hw/arm/virt: Fix property "gic-version" error handling, Markus Armbruster, 2015/12/17