From patchwork Tue Apr 15 06:45:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 339167 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F22E61400E8 for ; Tue, 15 Apr 2014 16:46:19 +1000 (EST) Received: from localhost ([::1]:47275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WZx8L-0004MI-NA for incoming@patchwork.ozlabs.org; Tue, 15 Apr 2014 02:46:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WZx7t-0003UZ-3c for qemu-devel@nongnu.org; Tue, 15 Apr 2014 02:45:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WZx7k-0006qj-WE for qemu-devel@nongnu.org; Tue, 15 Apr 2014 02:45:49 -0400 Received: from mail-qg0-f54.google.com ([209.85.192.54]:49209) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WZx7k-0006qb-RF for qemu-devel@nongnu.org; Tue, 15 Apr 2014 02:45:40 -0400 Received: by mail-qg0-f54.google.com with SMTP id z60so110978qgd.13 for ; Mon, 14 Apr 2014 23:45:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=1atwsWmkRfh2JJ5bHbZoMuQgBtGQ0qr9bg0gTqUGMfg=; b=izoto0VdUAv+Pp76kMEVH0ikOouitoxbTyJOQ8UimB2VcQWg9vBCxjZCMgoe9Mc467 i+xJBSAeOI9RHkRC484rWidLVH9KS0S2boQh14hlagzl8bs+AJ1/g4HhDFRA5HCLQEsO 6fv6tZKK+ixWSBGl2+gp/3kG9iKUlS344uF/Pty8ZGgs/vbfhPM02Fu+R6fyue2MxwfL 3QjHAszcfqZ4omAE8DAnaL2d7IVWsdRcH5pRqAUjpyHMZ10hS5YUAJ/Z7q2EV0E075D/ QBc4LHjxDslBeP8XTKbaVmeXeMlM93cP9l2bGAcwRuf/7ICFd3DOB2axwnm7u4a5YoUN OZ0A== X-Gm-Message-State: ALoCoQmhTMqgg4PkvezZ+HkhiYGgfRsnoIglP2awOHWv/ky8OQO+mdE5/3gim//ykCQHHsRRfFg2 X-Received: by 10.224.114.130 with SMTP id e2mr25339634qaq.53.1397544340453; Mon, 14 Apr 2014 23:45:40 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id j16sm12954926qgd.14.2014.04.14.23.45.39 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 14 Apr 2014 23:45:39 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Mon, 14 Apr 2014 23:45:07 -0700 Message-Id: X-Mailer: git-send-email 1.9.2.1.g06c4abd In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.54 Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH v1 3/3] vl.c: Use qemu_get_boot_opts 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 To simplfiy and make consistent with surrounding code using qemu_get_machine_opts(). Create a new local variable name boot_opts for consistency as well. Signed-off-by: Peter Crosthwaite --- vl.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/vl.c b/vl.c index d761211..5185537 100644 --- a/vl.c +++ b/vl.c @@ -2954,7 +2954,7 @@ int main(int argc, char **argv, char **envp) const char *boot_order; DisplayState *ds; int cyls, heads, secs, translation; - QemuOpts *hda_opts = NULL, *opts, *machine_opts; + QemuOpts *hda_opts = NULL, *opts, *machine_opts, *boot_opts; QemuOptsList *olist; int optind; const char *optarg; @@ -2982,6 +2982,9 @@ int main(int argc, char **argv, char **envp) const char *trace_events = NULL; const char *trace_file = NULL; + char *normal_boot_order; + const char *order, *once; + atexit(qemu_run_exit_notifiers); error_set_progname(argv[0]); qemu_init_exec_dir(argv[0]); @@ -4200,29 +4203,25 @@ int main(int argc, char **argv, char **envp) bios_name = qemu_opt_get(machine_opts, "firmware"); boot_order = machine->default_boot_order; - opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL); - if (opts) { - char *normal_boot_order; - const char *order, *once; - - order = qemu_opt_get(opts, "order"); - if (order) { - validate_bootdevices(order); - boot_order = order; - } + boot_opts = qemu_get_boot_opts(); - once = qemu_opt_get(opts, "once"); - if (once) { - validate_bootdevices(once); - normal_boot_order = g_strdup(boot_order); - boot_order = once; - qemu_register_reset(restore_boot_order, normal_boot_order); - } + order = qemu_opt_get(boot_opts, "order"); + if (order) { + validate_bootdevices(order); + boot_order = order; + } - boot_menu = qemu_opt_get_bool(opts, "menu", boot_menu); - boot_strict = qemu_opt_get_bool(opts, "strict", false); + once = qemu_opt_get(boot_opts, "once"); + if (once) { + validate_bootdevices(once); + normal_boot_order = g_strdup(boot_order); + boot_order = once; + qemu_register_reset(restore_boot_order, normal_boot_order); } + boot_menu = qemu_opt_get_bool(boot_opts, "menu", boot_menu); + boot_strict = qemu_opt_get_bool(boot_opts, "strict", false); + if (!kernel_cmdline) { kernel_cmdline = ""; }