From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQnCz-0006Yp-CA for qemu-devel@nongnu.org; Tue, 23 Oct 2012 18:44:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQnCx-0003rR-Iq for qemu-devel@nongnu.org; Tue, 23 Oct 2012 18:44:25 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:48131) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQnCx-0003q2-1f for qemu-devel@nongnu.org; Tue, 23 Oct 2012 18:44:23 -0400 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 24 Oct 2012 08:40:52 +1000 Date: Wed, 24 Oct 2012 09:45:18 +1100 From: David Gibson Message-ID: <20121023224518.GF13231@truffula.fritz.box> References: <1350986975-21786-1-git-send-email-aviksil@linux.vnet.ibm.com> <1350986975-21786-3-git-send-email-aviksil@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1350986975-21786-3-git-send-email-aviksil@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH 2/2] pseries: set boot-device property only if boot order specified List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avik Sil Cc: aliguori@us.ibm.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org On Tue, Oct 23, 2012 at 03:39:35PM +0530, Avik Sil wrote: > Signed-off-by: Avik Sil As Anthony suggests, it would be better to explicitly remove the normal default boot order in this patch, after adding it for absolutely everything in the first patch. This also needs a better patch comment, explaining the significance of the presence/absence of the property on firmware behaviour. > --- > hw/spapr.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/hw/spapr.c b/hw/spapr.c > index 637b3fb..1b2340c 100644 > --- a/hw/spapr.c > +++ b/hw/spapr.c > @@ -283,7 +283,9 @@ static void *spapr_create_fdt_skel(const char *cpu_model, > > _FDT((fdt_property(fdt, "qemu,boot-kernel", &kprop, sizeof(kprop)))); > } > - _FDT((fdt_property_string(fdt, "qemu,boot-device", boot_device))); > + if (boot_device) { > + _FDT((fdt_property_string(fdt, "qemu,boot-device", boot_device))); > + } > _FDT((fdt_property_cell(fdt, "qemu,graphic-width", graphic_width))); > _FDT((fdt_property_cell(fdt, "qemu,graphic-height", graphic_height))); > _FDT((fdt_property_cell(fdt, "qemu,graphic-depth", graphic_depth))); -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson