diff mbox

vl: Clean up unnecessary boot_order complications

Message ID 1380628042-24309-1-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster Oct. 1, 2013, 11:47 a.m. UTC 
From: Markus Armbruster <armbru@redhat.com>

Messed up in commit 8281abd.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 vl.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Michael Tokarev Oct. 2, 2013, 4:35 p.m. UTC | #1 
01.10.2013 15:47, armbru@redhat.com пишет:
> From: Markus Armbruster <armbru@redhat.com>
>
> Messed up in commit 8281abd.

Thanks, applied to the trivial patches queue.

/mjt
diff mbox

Patch

diff --git a/vl.c b/vl.c
index 983cdc6..7e1f408 100644
--- a/vl.c
+++ b/vl.c
@@ -2825,7 +2825,7 @@  int main(int argc, char **argv, char **envp)
     const char *icount_option = NULL;
     const char *initrd_filename;
     const char *kernel_filename, *kernel_cmdline;
-    const char *boot_order = NULL;
+    const char *boot_order;
     DisplayState *ds;
     int cyls, heads, secs, translation;
     QemuOpts *hda_opts = NULL, *opts, *machine_opts;
@@ -4050,9 +4050,7 @@  int main(int argc, char **argv, char **envp)
     initrd_filename = qemu_opt_get(machine_opts, "initrd");
     kernel_cmdline = qemu_opt_get(machine_opts, "append");
 
-    if (!boot_order) {
-        boot_order = machine->default_boot_order;
-    }
+    boot_order = machine->default_boot_order;
     opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
     if (opts) {
         char *normal_boot_order;