summaryrefslogtreecommitdiffstats
path: root/hw/shix.c
diff options
context:
space:
mode:
authorAvik Sil2013-01-08 08:06:30 +0100
committerAnthony Liguori2013-01-16 01:26:18 +0100
commite4ada29e909787f629626660b1561f6a680187d3 (patch)
tree181d40aa8774f4c0bd2f109cdfbdf59c9b3ca23d /hw/shix.c
parentacl: Free memory allocated with g_malloc() with g_free() (diff)
downloadqemu-e4ada29e909787f629626660b1561f6a680187d3.tar.gz
qemu-e4ada29e909787f629626660b1561f6a680187d3.tar.xz
qemu-e4ada29e909787f629626660b1561f6a680187d3.zip
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/shix.c')
-rw-r--r--hw/shix.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/shix.c b/hw/shix.c
index 86d703ad70..6f2d55a155 100644
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -92,6 +92,7 @@ static QEMUMachine shix_machine = {
.desc = "shix card",
.init = shix_init,
.is_default = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static void shix_machine_init(void)