From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6yc0-0003jl-51 for qemu-devel@nongnu.org; Thu, 10 Dec 2015 05:38:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6ybz-0001Kn-6l for qemu-devel@nongnu.org; Thu, 10 Dec 2015 05:38:12 -0500 Received: from mail-vk0-x22c.google.com ([2607:f8b0:400c:c05::22c]:33185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6ybz-0001KX-20 for qemu-devel@nongnu.org; Thu, 10 Dec 2015 05:38:11 -0500 Received: by vkca188 with SMTP id a188so77581449vkc.0 for ; Thu, 10 Dec 2015 02:38:10 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1449743372-17169-4-git-send-email-armbru@redhat.com> References: <1449743372-17169-1-git-send-email-armbru@redhat.com> <1449743372-17169-4-git-send-email-armbru@redhat.com> From: Peter Maydell Date: Thu, 10 Dec 2015 10:37:51 +0000 Message-ID: Content-Type: text/plain; charset=UTF-8 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: Markus Armbruster Cc: qemu-arm , QEMU Developers 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? Otherwise Reviewed-by: Peter Maydell thanks -- PMM