From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWlXL-0006Qs-3Z for qemu-devel@nongnu.org; Thu, 17 Oct 2013 07:14:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VWlXE-0006cP-Ky for qemu-devel@nongnu.org; Thu, 17 Oct 2013 07:14:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWlXE-0006cL-Cz for qemu-devel@nongnu.org; Thu, 17 Oct 2013 07:14:32 -0400 From: Gerd Hoffmann Date: Thu, 17 Oct 2013 13:14:26 +0200 Message-Id: <1382008466-7709-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] 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 Signed-off-by: Gerd Hoffmann --- vl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 7e1f408..ef450ee 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 */ } }, @@ -3228,7 +3232,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; @@ -4049,6 +4053,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