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/boards.h | |
parent | 038794cfe1c0eece8968418077e4af601acd5aff (diff) | |
download | qemu-e4ada29e909787f629626660b1561f6a680187d3.zip qemu-e4ada29e909787f629626660b1561f6a680187d3.tar.gz qemu-e4ada29e909787f629626660b1561f6a680187d3.tar.bz2 |
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/boards.h')
-rw-r--r-- | hw/boards.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/boards.h b/hw/boards.h index 4540e95..3ff9665 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -6,6 +6,9 @@ #include "sysemu/blockdev.h" #include "qdev.h" +#define DEFAULT_MACHINE_OPTIONS \ + .boot_order = "cad" + typedef struct QEMUMachineInitArgs { ram_addr_t ram_size; const char *boot_device; @@ -35,6 +38,7 @@ typedef struct QEMUMachine { no_sdcard:1; int is_default; const char *default_machine_opts; + const char *boot_order; GlobalProperty *compat_props; struct QEMUMachine *next; const char *hw_version; |