summaryrefslogtreecommitdiffstats
path: root/hw/spapr.c
diff options
context:
space:
mode:
authorAvik Sil <aviksil@linux.vnet.ibm.com>2013-01-08 12:36:30 +0530
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-15 18:26:18 -0600
commite4ada29e909787f629626660b1561f6a680187d3 (patch)
tree181d40aa8774f4c0bd2f109cdfbdf59c9b3ca23d /hw/spapr.c
parent038794cfe1c0eece8968418077e4af601acd5aff (diff)
downloadhqemu-e4ada29e909787f629626660b1561f6a680187d3.zip
hqemu-e4ada29e909787f629626660b1561f6a680187d3.tar.gz
Make default boot order machine specific
This patch makes default boot order machine specific instead of set globally. The default boot order can be set per machine in QEMUMachine boot_order. This also allows a machine to receive a NULL boot order when -boot isn't used and take an appropriate action accordingly. This helps machine boots from the devices as set in guest's non-volatile memory location in case no boot order is provided by the user. Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> 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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/spapr.c b/hw/spapr.c
index 76aa09b..6476598 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -964,6 +964,7 @@ static QEMUMachine spapr_machine = {
.block_default_type = IF_SCSI,
.max_cpus = MAX_CPUS,
.no_parallel = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static void spapr_machine_init(void)
OpenPOWER on IntegriCloud