From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45732)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <armbru@redhat.com>) id 1a9SaF-0006Xv-B9
	for qemu-devel@nongnu.org; Thu, 17 Dec 2015 02:02:40 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <armbru@redhat.com>) id 1a9SaE-0006vG-BD
	for qemu-devel@nongnu.org; Thu, 17 Dec 2015 02:02:39 -0500
From: Markus Armbruster <armbru@redhat.com>
References: <1449743372-17169-1-git-send-email-armbru@redhat.com>
	<1449743372-17169-7-git-send-email-armbru@redhat.com>
	<CAFEAcA9-7+2MOh8=c3+RsE8x2kkOwJzLapTAR+CpRtq=RP8SiQ@mail.gmail.com>
Date: Thu, 17 Dec 2015 08:02:29 +0100
In-Reply-To: <CAFEAcA9-7+2MOh8=c3+RsE8x2kkOwJzLapTAR+CpRtq=RP8SiQ@mail.gmail.com>
	(Peter Maydell's message of "Tue, 15 Dec 2015 11:38:47 +0000")
Message-ID: <8760zx4kxm.fsf@blackfin.pond.sub.org>
MIME-Version: 1.0
Content-Type: text/plain
Subject: Re: [Qemu-devel] [PATCH 06/12] hw/arm/virt: Fix property
	"gic-version" error handling
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm <qemu-arm@nongnu.org>, QEMU Developers <qemu-devel@nongnu.org>

Peter Maydell <peter.maydell@linaro.org> writes:

> On 10 December 2015 at 10:29, Markus Armbruster <armbru@redhat.com> wrote:
>> virt_set_gic_version() calls exit(1) when passed an invalid property
>> value.  Property setters are not supposed to do that.  Screwed up in
>> commit b92ad39.  Harmless, because the property belongs to a machine.
>> Set an error object instead.
>>
>> Cc: Peter Maydell <peter.maydell@linaro.org>
>> Cc: qemu-arm@nongnu.org
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  hw/arm/virt.c | 5 ++---
>>  1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
>> index 9c6792c..2a120dd 100644
>> --- a/hw/arm/virt.c
>> +++ b/hw/arm/virt.c
>> @@ -1126,9 +1126,8 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp)
>>      } else if (!strcmp(value, "host")) {
>>          vms->gic_version = 0; /* Will probe later */
>>      } else {
>> -        error_report("Invalid gic-version option value");
>> -        error_printf("Allowed gic-version values are: 3, 2, host\n");
>> -        exit(1);
>> +        error_setg(errp, "Invalid gic-version value");
>> +        error_append_hint(errp, "Valid values are: 3, 2, host\n");
>>      }
>
> Should hint strings have trailing newlines?

Two answers:

1. No, because error_report_err() prints the hint followed by a newline.

2. Yes, because error_appent_hint() accumulates, and requiring its users
to know which call will be the final one is an awkward interface.

I'll change error_report_err() and improve the documentation.

> Otherwise
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Thanks!