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/nseries.c | |
| 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/nseries.c')
| -rw-r--r-- | hw/nseries.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/nseries.c b/hw/nseries.c index d96b750..6b717cf 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -1411,12 +1411,14 @@ static QEMUMachine n800_machine = { .name = "n800", .desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)", .init = n800_init, + DEFAULT_MACHINE_OPTIONS, }; static QEMUMachine n810_machine = { .name = "n810", .desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)", .init = n810_init, + DEFAULT_MACHINE_OPTIONS, }; static void nseries_machine_init(void) |