From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQyQP-0005Tk-80 for qemu-devel@nongnu.org; Tue, 01 Oct 2013 07:47:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VQyQJ-0000ls-5R for qemu-devel@nongnu.org; Tue, 01 Oct 2013 07:47:33 -0400 From: armbru@redhat.com Date: Tue, 1 Oct 2013 13:47:22 +0200 Message-Id: <1380628042-24309-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] vl: Clean up unnecessary boot_order complications List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, anthony@codemonkey.ws From: Markus Armbruster Messed up in commit 8281abd. Signed-off-by: Markus Armbruster --- 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.8.1.4