diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-12-17 17:35:11 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-01-13 11:58:58 +0100 |
| commit | b097e481217ac30eeac675ec16711ef360ccce72 (patch) | |
| tree | eff35895b68f86ebaf9de61b025f55a4de25e9b2 /hw/timer | |
| parent | 84a3a53cf61ef691478bd91afa455c801696053c (diff) | |
| download | qemu-b097e481217ac30eeac675ec16711ef360ccce72.tar.gz | |
arm_mptimer: Don't use hw_error() in realize() method
Device realize() methods aren't supposed to call hw_error(), they
should set an error and fail cleanly. Do that.
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <1450370121-5768-4-git-send-email-armbru@redhat.com>
Diffstat (limited to 'hw/timer')
| -rw-r--r-- | hw/timer/arm_mptimer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 3e59c2a288..5dfab669f4 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" |