Merge remote-tracking branch 'mst/tags/for_anthony' into staging

[qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index dfbc071eefcdaae6203b3731a6b75bd96b286c6e..b4b119a8853a52d9281574088f349bfd5f3aed46 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4123,7 +4123,7 @@ int main(int argc, char **argv, char **envp)
     kernel_cmdline = qemu_opt_get(machine_opts, "append");
 
     if (!boot_order) {
-        boot_order = machine->boot_order;
+        boot_order = machine->default_boot_order;
     }
     opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
     if (opts) {
@@ -4311,7 +4311,7 @@ int main(int argc, char **argv, char **envp)
     qdev_machine_init();
 
     QEMUMachineInitArgs args = { .ram_size = ram_size,
-                                 .boot_device = boot_order,
+                                 .boot_order = boot_order,
                                  .kernel_filename = kernel_filename,
                                  .kernel_cmdline = kernel_cmdline,
                                  .initrd_filename = initrd_filename,