diff options
| author | Avik Sil <aviksil@linux.vnet.ibm.com> | 2013-01-08 12:36:30 +0530 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-15 18:26:18 -0600 |
| commit | e4ada29e909787f629626660b1561f6a680187d3 (patch) | |
| tree | 181d40aa8774f4c0bd2f109cdfbdf59c9b3ca23d /hw/ppc | |
| parent | 038794cfe1c0eece8968418077e4af601acd5aff (diff) | |
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/ppc')
| -rw-r--r-- | hw/ppc/e500plat.c | 1 | ||||
| -rw-r--r-- | hw/ppc/mpc8544ds.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 4deb02ac38..2dcc4a9852 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -54,6 +54,7 @@ static QEMUMachine e500plat_machine = { .desc = "generic paravirt e500 platform", .init = e500plat_init, .max_cpus = 15, + DEFAULT_MACHINE_OPTIONS, }; static void e500plat_machine_init(void) diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c index f9ae20f5a3..8e05e55c87 100644 --- a/hw/ppc/mpc8544ds.c +++ b/hw/ppc/mpc8544ds.c @@ -54,6 +54,7 @@ static QEMUMachine ppce500_machine = { .desc = "mpc8544ds", .init = mpc8544ds_init, .max_cpus = 15, + DEFAULT_MACHINE_OPTIONS, }; static void ppce500_machine_init(void) |