From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46912)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <arei.gonglei@huawei.com>) id 1Y0ro0-00069E-6t
	for qemu-devel@nongnu.org; Tue, 16 Dec 2014 08:04:53 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <arei.gonglei@huawei.com>) id 1Y0rnv-0002tt-6c
	for qemu-devel@nongnu.org; Tue, 16 Dec 2014 08:04:48 -0500
Message-ID: <54902DCA.7040201@huawei.com>
Date: Tue, 16 Dec 2014 21:04:10 +0800
From: Gonglei <arei.gonglei@huawei.com>
MIME-Version: 1.0
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>
In-Reply-To: <CAFEAcA-17Upc1BQXqNVPToxaJyYS4H5krQE73xD+Moig9xU=XQ@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
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: Peter Maydell <peter.maydell@linaro.org>
Cc: Blue Swirl <blauwirbel@gmail.com>, Alexander Graf <agraf@suse.de>, "qemu-ppc@nongnu.org" <qemu-ppc@nongnu.org>, QEMU Developers <qemu-devel@nongnu.org>, "Michael S. Tsirkin" <mst@redhat.com>

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);
+    }

     /* floppy type */
     if (floppy) {

Regards,
-Gonglei