From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50363)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1Y0s6V-0000N5-SJ
	for qemu-devel@nongnu.org; Tue, 16 Dec 2014 08:24:00 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1Y0s6P-0008No-7H
	for qemu-devel@nongnu.org; Tue, 16 Dec 2014 08:23:55 -0500
Received: from mail-lb0-f178.google.com ([209.85.217.178]:60026)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1Y0s6P-0008NX-19
	for qemu-devel@nongnu.org; Tue, 16 Dec 2014 08:23:49 -0500
Received: by mail-lb0-f178.google.com with SMTP id f15so12185777lbj.9
	for <qemu-devel@nongnu.org>; Tue, 16 Dec 2014 05:23:48 -0800 (PST)
MIME-Version: 1.0
In-Reply-To: <54902DCA.7040201@huawei.com>
References: <1418721773-29042-1-git-send-email-arei.gonglei@huawei.com>
	<1418721773-29042-6-git-send-email-arei.gonglei@huawei.com>
	<CAFEAcA-17Upc1BQXqNVPToxaJyYS4H5krQE73xD+Moig9xU=XQ@mail.gmail.com>
	<54902DCA.7040201@huawei.com>
From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 16 Dec 2014 13:23:26 +0000
Message-ID: <CAFEAcA8H-s758bOGy-7Lvm9gC7d6_VwkKv0WEcSN5mVZeMRFqA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PULL 5/5] bootdevice: add Error **errp argument
	for QEMUBootSetHandler
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: Gonglei <arei.gonglei@huawei.com>
Cc: Blue Swirl <blauwirbel@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, "qemu-ppc@nongnu.org" <qemu-ppc@nongnu.org>, Alexander Graf <agraf@suse.de>, QEMU Developers <qemu-devel@nongnu.org>

On 16 December 2014 at 13:04, Gonglei <arei.gonglei@huawei.com> wrote:
> On 2014/12/16 20:42, Peter Maydell wrote:
>
>> On 16 December 2014 at 09:22,  <arei.gonglei@huawei.com> wrote:
>>> @@ -412,9 +411,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
>>>      object_property_set_link(OBJECT(machine), OBJECT(s),
>>>                               "rtc_state", &error_abort);
>>>
>>> -    if (set_boot_dev(s, boot_device)) {
>>> -        exit(1);
>>> -    }
>>> +    set_boot_dev(s, boot_device, &error_abort);
>>
>> This turns a "print error message and exit" path into
>> an abort(), which doesn't seem right (this can be triggered
>> by bad user input arguments, yes?). error_abort should
>> only be used in cases where you would assert() if there
>> was an error (ie where it would be a QEMU bug if it
>> happened).
>>
>
> Yes, agree. How does use a incremental patch fix this, Peter?
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 99deba6..d7822b8 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -364,6 +364,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
>      FDriveType fd_type[2] = { FDRIVE_DRV_NONE, FDRIVE_DRV_NONE };
>      static pc_cmos_init_late_arg arg;
>      PCMachineState *pc_machine = PC_MACHINE(machine);
> +    Error *local_err = NULL;
>
>      /* various important CMOS locations needed by PC/Bochs bios */
>
> @@ -411,7 +412,10 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
>      object_property_set_link(OBJECT(machine), OBJECT(s),
>                               "rtc_state", &error_abort);
>
> -    set_boot_dev(s, boot_device, &error_abort);
> +    set_boot_dev(s, boot_device, &local_err);
> +    if (local_err) {
> +        exit(1);
> +    }

That won't print the error message at all...

-- PMM