From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEnHj-0008Mf-9T for qemu-devel@nongnu.org; Fri, 23 Jan 2015 18:05:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEnHf-0003hz-51 for qemu-devel@nongnu.org; Fri, 23 Jan 2015 18:05:02 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36059 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEnHe-0003hv-Tz for qemu-devel@nongnu.org; Fri, 23 Jan 2015 18:04:59 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 17E85AD27 for ; Fri, 23 Jan 2015 23:04:58 +0000 (UTC) Message-ID: <54C2D399.3080307@suse.de> Date: Sat, 24 Jan 2015 00:04:57 +0100 From: Alexander Graf MIME-Version: 1.0 References: <1422053517-23781-1-git-send-email-dvaleev@suse.de> <1422053517-23781-2-git-send-email-dvaleev@suse.de> In-Reply-To: <1422053517-23781-2-git-send-email-dvaleev@suse.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/2] hw/ppc/spapr Add qemu_register_boot_set for SPAPR List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: dvaleev@suse.de, qemu-devel@nongnu.org Cc: Dinar Valeev On 23.01.15 23:51, dvaleev@suse.de wrote: > From: Dinar Valeev > > In order to have -boot once=d functioning, it is required to have > qemu_register_boot_set > > qemu-system-ppc64 -enable-kvm -boot once=d > > Ready! > 0 > dev /chosen ok > 0 > .properties > ... > qemu,boot-device d > ... > 0 > reset-all > > Ready! > 0 > dev /chosen ok > 0 > .properties > ... > qemu,boot-device cdn > ... > > Signed-off-by: Dinar Valeev > --- > hw/ppc/spapr.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 3d2cfa3..38b03fc 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -314,6 +314,16 @@ static void add_str(GString *s, const gchar *s1) > g_string_append_len(s, s1, strlen(s1) + 1); > } > > +static void spapr_boot_set(void *opaque, const char *boot_device, > + Error **errp) > +{ > + int offset; > + offset = fdt_path_offset(opaque, "/chosen"); > + fdt_setprop_string(opaque, offset, "qemu,boot-device", boot_device); > + > +} > + > + > static void *spapr_create_fdt_skel(hwaddr initrd_base, > hwaddr initrd_size, > hwaddr kernel_size, > @@ -414,6 +424,8 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base, > if (boot_device) { > _FDT((fdt_property_string(fdt, "qemu,boot-device", boot_device))); > } > + qemu_register_boot_set(spapr_boot_set, fdt); If you simply move the code above (the _FDT() one) from create_fdt_skel to spapr_finalize_fdt() you should have the same net effect and much cleaner code :). Alex > + > if (boot_menu) { > _FDT((fdt_property_cell(fdt, "qemu,boot-menu", boot_menu))); > } >