Re: [Qemu-devel] [Qemu-ppc] [PATCH 2/2] pseries: set boot-device property only if boot order specified

[David Gibson <dwg@au1.ibm.com>]

On Tue, Oct 23, 2012 at 03:39:35PM +0530, Avik Sil wrote:
> Signed-off-by: Avik Sil <aviksil@linux.vnet.ibm.com>

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