From e4ada29e909787f629626660b1561f6a680187d3 Mon Sep 17 00:00:00 2001 From: Avik Sil Date: Tue, 8 Jan 2013 12:36:30 +0530 Subject: 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 Signed-off-by: Avik Sil Signed-off-by: Anthony Liguori --- hw/boards.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'hw/boards.h') diff --git a/hw/boards.h b/hw/boards.h index 4540e952f7..3ff9665b1f 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; -- cgit 1.4.1