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/xilinx_zynq.c | |
| parent | 038794cfe1c0eece8968418077e4af601acd5aff (diff) | |
| download | hqemu-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/xilinx_zynq.c')
| -rw-r--r-- | hw/xilinx_zynq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c index da0a7d0..8dede9f 100644 --- a/hw/xilinx_zynq.c +++ b/hw/xilinx_zynq.c @@ -203,7 +203,8 @@ static QEMUMachine zynq_machine = { .init = zynq_init, .block_default_type = IF_SCSI, .max_cpus = 1, - .no_sdcard = 1 + .no_sdcard = 1, + DEFAULT_MACHINE_OPTIONS, }; static void zynq_machine_init(void) |
