From patchwork Sun Oct 6 09:32:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 280843 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 05E5D2C00B3 for ; Sun, 6 Oct 2013 20:41:41 +1100 (EST) Received: from localhost ([::1]:54325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VSkqJ-0001XF-34 for incoming@patchwork.ozlabs.org; Sun, 06 Oct 2013 05:41:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47631) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VSko5-0006W9-D9 for qemu-devel@nongnu.org; Sun, 06 Oct 2013 05:39:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VSknv-0003Lq-VE for qemu-devel@nongnu.org; Sun, 06 Oct 2013 05:39:21 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:39036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VSknv-0003LM-MT; Sun, 06 Oct 2013 05:39:11 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id EBB5540D02; Sun, 6 Oct 2013 13:39:09 +0400 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id F33BD526; Sun, 6 Oct 2013 13:33:03 +0400 (MSK) Received: (nullmailer pid 25823 invoked by uid 1000); Sun, 06 Oct 2013 09:33:02 -0000 From: Michael Tokarev To: aliguori@us.ibm.com Date: Sun, 6 Oct 2013 13:32:56 +0400 Message-Id: <1381051979-25742-12-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1381051979-25742-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1381051979-25742-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Michael Tokarev , Markus Armbruster , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 11/14] vl: Clean up unnecessary boot_order complications X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster Messed up in commit 8281abd. Signed-off-by: Markus Armbruster Signed-off-by: Michael Tokarev --- 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;