diff options
| author | Avik Sil <aviksil@linux.vnet.ibm.com> | 2013-01-08 12:36:31 +0530 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-15 18:26:18 -0600 |
| commit | 2c9ee0291f8ca7e18f8e96a34e8f4be7867219d2 (patch) | |
| tree | 4eab44504057cc295dd354068ed4110b195d916b /hw/spapr.c | |
| parent | e4ada29e909787f629626660b1561f6a680187d3 (diff) | |
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 <aliguori@us.ibm.com>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avik Sil <aviksil@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/spapr.c')
| -rw-r--r-- | hw/spapr.c | 6 |
1 files changed, 4 insertions, 2 deletions
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) |