Commit e3fdc535 authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael Tokarev
Browse files

vl: Clean up unnecessary boot_order complications 



Messed up in commit 8281abd5.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 49aa4058

vl.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

    }

    opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);

    if (opts) {

        char *normal_boot_order;