From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37673)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dvaleev@suse.de>) id 1YG1xb-0003w4-SH
	for qemu-devel@nongnu.org; Tue, 27 Jan 2015 03:57:25 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <dvaleev@suse.de>) id 1YG1xY-0005Cz-JQ
	for qemu-devel@nongnu.org; Tue, 27 Jan 2015 03:57:23 -0500
Message-ID: <54C752EE.5040302@suse.de>
Date: Tue, 27 Jan 2015 09:57:18 +0100
From: Dinar Valeev <dvaleev@suse.de>
MIME-Version: 1.0
References: <1422316341-28983-1-git-send-email-dvaleev@suse.de>
	<1422316341-28983-3-git-send-email-dvaleev@suse.de>
	<54C6FD48.8000204@huawei.com>
In-Reply-To: <54C6FD48.8000204@huawei.com>
Content-Type: text/plain; charset=gbk
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 2/2] bootdevice: update boot_order in
	MachineState
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: "armbru@redhat.com" <armbru@redhat.com>, Dinar Valeev <dvaleev@suse.com>, "qemu-ppc@nongnu.org" <qemu-ppc@nongnu.org>, "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, Alexander Graf <agraf@suse.de>

On 01/27/2015 03:51 AM, Gonglei wrote:
> On 2015/1/27 7:52, dvaleev@suse.de wrote:
> 
>> From: Dinar Valeev <dvaleev@suse.com>
>>
>> on sPAPR we need to update boot_order in MachineState in case it
>> got changed on reset.
>>
>> Signed-off-by: Dinar Valeev <dvaleev@suse.com>
>> ---
>>  bootdevice.c | 3 +++
>>  1 file changed, 3 insertions(+)
>>
>> diff --git a/bootdevice.c b/bootdevice.c
>> index 5914417..4f11a06 100644
>> --- a/bootdevice.c
>> +++ b/bootdevice.c
>> @@ -26,6 +26,7 @@
>>  #include "qapi/visitor.h"
>>  #include "qemu/error-report.h"
>>  #include "hw/hw.h"
>> +#include "hw/boards.h"
>>  
>>  typedef struct FWBootEntry FWBootEntry;
>>  
>> @@ -50,6 +51,8 @@ void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque)
>>  void qemu_boot_set(const char *boot_order, Error **errp)
>>  {
>>      Error *local_err = NULL;
>> +    MachineState *machine = MACHINE(qdev_get_machine());
>> +    machine->boot_order = boot_order;
>>  
>>      if (!boot_set_handler) {
>>          error_setg(errp, "no function defined to set boot device list for"
> 
> Have you registered boot set handler on ppc/sPAPR platform by calling
> qemu_register_boot_set()? Otherwise qemu_boot_set function
>  will return error.
No, I set boot_order on each machine reset. My tests are showing it works without an error.
Previous patch was using qemu_register_boot_set, but Alexender Graf, suggested me to use MachineState and simply update on each guest reset.

> 
> Regards,
> -Gonglei
>