From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnSYd-0004Lc-L6 for qemu-devel@nongnu.org; Mon, 02 Dec 2013 07:25:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnSYX-0003GM-EV for qemu-devel@nongnu.org; Mon, 02 Dec 2013 07:24:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24595) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnSYX-0003GA-5l for qemu-devel@nongnu.org; Mon, 02 Dec 2013 07:24:53 -0500 From: Gerd Hoffmann Date: Mon, 2 Dec 2013 13:24:37 +0100 Message-Id: <1385987083-19917-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1385987083-19917-1-git-send-email-kraxel@redhat.com> References: <1385987083-19917-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/8] add firmware to machine options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori This patch adds firmware to the machine options. -bios becomes a shortcut for -machine firmware=. Advantage is that the firmware can be specified via config file as -machine is parsed using QemuOpts and it is also possible to use different defaults for different machine types (via QEMUMachine->default_machine_opts). Signed-off-by: Gerd Hoffmann --- vl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 8d5d874..27b09e5 100644 --- a/vl.c +++ b/vl.c @@ -428,6 +428,10 @@ static QemuOptsList qemu_machine_opts = { .name = "usb", .type = QEMU_OPT_BOOL, .help = "Set on/off to enable/disable usb", + },{ + .name = "firmware", + .type = QEMU_OPT_STRING, + .help = "firmware image", }, { /* End of list */ } }, @@ -3229,7 +3233,7 @@ int main(int argc, char **argv, char **envp) } break; case QEMU_OPTION_bios: - bios_name = optarg; + qemu_opts_set(qemu_find_opts("machine"), 0, "firmware", optarg); break; case QEMU_OPTION_singlestep: singlestep = 1; @@ -4050,6 +4054,7 @@ int main(int argc, char **argv, char **envp) kernel_filename = qemu_opt_get(machine_opts, "kernel"); initrd_filename = qemu_opt_get(machine_opts, "initrd"); kernel_cmdline = qemu_opt_get(machine_opts, "append"); + bios_name = qemu_opt_get(machine_opts, "firmware"); boot_order = machine->default_boot_order; opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL); -- 1.8.3.1