From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJf4S-0002eJ-1q for qemu-devel@nongnu.org; Fri, 06 Feb 2015 04:19:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJf4N-0002Z7-QH for qemu-devel@nongnu.org; Fri, 06 Feb 2015 04:19:28 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:49662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJf4N-0002WZ-6R for qemu-devel@nongnu.org; Fri, 06 Feb 2015 04:19:23 -0500 Message-ID: <54D486C6.9050208@huawei.com> Date: Fri, 6 Feb 2015 17:17:58 +0800 From: Gonglei MIME-Version: 1.0 References: <1422966857-6776-1-git-send-email-arei.gonglei@huawei.com> <1422966857-6776-2-git-send-email-arei.gonglei@huawei.com> <87oap7wh85.fsf@blackfin.pond.sub.org> In-Reply-To: <87oap7wh85.fsf@blackfin.pond.sub.org> Content-Type: text/plain; charset="GB2312" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/3] bootdevice: remove the check about boot_set_handler List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: "Huangpeng (Peter)" , "dvaleev@suse.de" , "qemu-devel@nongnu.org" , "agraf@suse.de" On 2015/2/6 16:56, Markus Armbruster wrote: > writes: > >> From: Gonglei >> >> The reset logic can be done by both machine reset and >> boot handler. So we shouldn't return error when the boot >> handler callback don't be set. >> >> Signed-off-by: Gonglei >> Reviewed-by: Alexander Graf >> --- >> bootdevice.c | 10 +++------- >> 1 file changed, 3 insertions(+), 7 deletions(-) >> >> diff --git a/bootdevice.c b/bootdevice.c >> index 5914417..52d3f9e 100644 >> --- a/bootdevice.c >> +++ b/bootdevice.c >> @@ -51,19 +51,15 @@ void qemu_boot_set(const char *boot_order, Error **errp) >> { >> Error *local_err = NULL; >> >> - if (!boot_set_handler) { >> - error_setg(errp, "no function defined to set boot device list for" >> - " this architecture"); >> - return; >> - } >> - >> validate_bootdevices(boot_order, &local_err); >> if (local_err) { >> error_propagate(errp, local_err); >> return; >> } >> >> - boot_set_handler(boot_set_opaque, boot_order, errp); >> + if (boot_set_handler) { >> + boot_set_handler(boot_set_opaque, boot_order, errp); >> + } >> } >> >> void validate_bootdevices(const char *devices, Error **errp) > > Two callers: > > * HMP command boot_set > > Before your patch: command fails when the target doesn't support > changing the boot order. > > After your patch: command silently does nothing. I'm afraid that's a > regression. > > Aside: looks like there's no QMP command. Yes. > > * restore_boot_order() > > No change yet, because restore_boot_order() ignores errors. But PATCH > 3 will make it abort on error. I guess that's why you make the change > here. Actually, I add this patch based on the previous conversation: It duplicates the reset logic as well as information holder locality (machine struct vs parameter). http://lists.gnu.org/archive/html/qemu-devel/2015-01/msg04172.html and http://lists.gnu.org/archive/html/qemu-devel/2015-01/msg04292.html Regards, -Gonglei > > To avoid the regression, you could drop PATCH 1, and change PATCH 3 to > something like > > - qemu_boot_set(normal_boot_order, NULL); > + if (boot_set_handler) { > + qemu_boot_set(normal_boot_order, &error_abort); > + } > > There are other ways, but this looks like the simplest one.