From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a70bN-0004tD-DM for qemu-devel@nongnu.org; Thu, 10 Dec 2015 07:45:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a70bJ-0003eI-FV for qemu-devel@nongnu.org; Thu, 10 Dec 2015 07:45:41 -0500 From: Markus Armbruster References: <1449743372-17169-1-git-send-email-armbru@redhat.com> <1449743372-17169-4-git-send-email-armbru@redhat.com> Date: Thu, 10 Dec 2015 13:45:25 +0100 In-Reply-To: (Peter Maydell's message of "Thu, 10 Dec 2015 10:37:51 +0000") Message-ID: <87zixieal6.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 03/12] arm_mptimer: Don't use hw_error() in realize() method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-arm , QEMU Developers Peter Maydell writes: > On 10 December 2015 at 10:29, Markus Armbruster wrote: >> Device realize() methods aren't supposed to call hw_error(), they >> should set an error and fail cleanly. Do that. >> >> Cc: Peter Maydell >> Cc: qemu-arm@nongnu.org >> Signed-off-by: Markus Armbruster >> --- >> 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..f1a34ec 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\n", >> + ARM_MPTIMER_MAX_CPUS); >> + return; > > I think the trailing newline is incorrect for error_setg, right? I always misse one... will fix! > Otherwise > Reviewed-by: Peter Maydell Thanks!