[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 11/14] vl: Clean up unnecessary boot_order complica
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 11/14] vl: Clean up unnecessary boot_order complications |
Date: |
Sun, 6 Oct 2013 13:32:56 +0400 |
From: Markus Armbruster <address@hidden>
Messed up in commit 8281abd.
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
vl.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
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;
--
1.7.10.4
- [Qemu-trivial] [PULL 00/14] Trivial patches for 2013-10-06, Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 02/14] tests: Update .gitignore for test-int128 and test-bitops, Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 08/14] sh4: Fix serial line access for Linux kernels later than 3.2, Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 06/14] target-i386: Fix compiler warning (integer constant is too large), Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 14/14] migration: Fix compiler warning ('caps' may be used uninitialized), Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 12/14] hw/9pfs: Fix errno value for xattr functions, Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 11/14] vl: Clean up unnecessary boot_order complications,
Michael Tokarev <=
- [Qemu-trivial] [PULL 03/14] tests: Fix schema parser test for in-tree build, Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 05/14] block: Remove unused assignment (fixes warning from clang), Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 01/14] .gitignore: ignore tests/qemu-iotests/socket_scm_helper, Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 07/14] hw/alpha: Fix compiler warning (integer constant is too large), Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 09/14] pci-ohci: Add missing 'break' in ohci_service_td, Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 04/14] exec: cleanup DEBUG_SUBPAGE, Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 13/14] util/path: Fix type which is longer than 8 bit for MinGW, Michael Tokarev, 2013/10/06
- [Qemu-trivial] [PULL 10/14] qemu-char: Fix potential out of bounds access to local arrays, Michael Tokarev, 2013/10/06