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/integratorcp.c | |
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/integratorcp.c')
-rw-r--r-- | hw/integratorcp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/integratorcp.c b/hw/integratorcp.c index 6c824dc36e..9e3630a43d 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -512,6 +512,7 @@ static QEMUMachine integratorcp_machine = { .desc = "ARM Integrator/CP (ARM926EJ-S)", .init = integratorcp_init, .is_default = 1, + DEFAULT_MACHINE_OPTIONS, }; static void integratorcp_machine_init(void) |