proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-07 14:59:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vl: Clean up unnecessary boot_order complications

Browse Source 
Messed up in commit 8281abd.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Markus Armbruster 2013-10-01 13:47:22 +02:00 committed by Michael Tokarev
parent 49aa4058ac
commit e3fdc535f2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vl.c
View File

@ -2825,7 +2825,7 @@ int main(int argc, char **argv, char **envp)
const char *icount_option = NULL; const char *icount_option = NULL;
const char *initrd_filename; const char *initrd_filename;
const char *kernel_filename, *kernel_cmdline; const char *kernel_filename, *kernel_cmdline;
const char *boot_order = NULL; const char *boot_order;
DisplayState *ds; DisplayState *ds;
int cyls, heads, secs, translation; int cyls, heads, secs, translation;
QemuOpts *hda_opts = NULL, *opts, *machine_opts; 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"); initrd_filename = qemu_opt_get(machine_opts, "initrd");
kernel_cmdline = qemu_opt_get(machine_opts, "append"); 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); opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
if (opts) { if (opts) {
char *normal_boot_order; char *normal_boot_order;