From: Avik Sil Date: Tue, 8 Jan 2013 07:06:31 +0000 (+0530) Subject: pseries: set no default boot order X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2c9ee0291f8ca7e18f8e96a34e8f4be7867219d2;p=qemu.git pseries: set no default boot order This patch removes the default boot order for pseries machine. This allows the machine to handle a NULL boot order in case no -boot option is provided. Thus it helps SLOF firmware to verify if boot order is specified in command line or not. If no boot order is provided SLOF tries to boot from the device set in the nvram. Reviewed-by: Anthony Liguori Acked-by: Alexander Graf Signed-off-by: Avik Sil Signed-off-by: Anthony Liguori --- diff --git a/hw/spapr.c b/hw/spapr.c index 6476598878..21c261be4a 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -287,7 +287,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))); @@ -964,7 +966,7 @@ static QEMUMachine spapr_machine = { .block_default_type = IF_SCSI, .max_cpus = MAX_CPUS, .no_parallel = 1, - DEFAULT_MACHINE_OPTIONS, + .boot_order = NULL, }; static void spapr_machine_init(void)