From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9u10-0006e2-Q9 for qemu-devel@nongnu.org; Tue, 20 Mar 2012 04:02:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S9u0t-0004NV-Qh for qemu-devel@nongnu.org; Tue, 20 Mar 2012 04:01:58 -0400 Received: from mail-ey0-f173.google.com ([209.85.215.173]:35124) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9u0t-0004MX-Hr for qemu-devel@nongnu.org; Tue, 20 Mar 2012 04:01:51 -0400 Received: by mail-ey0-f173.google.com with SMTP id f11so3332777eaa.4 for ; Tue, 20 Mar 2012 01:01:50 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 20 Mar 2012 09:01:31 +0100 Message-Id: <1332230498-20684-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1332230498-20684-1-git-send-email-pbonzini@redhat.com> References: <1332230498-20684-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 05/12] cmdline: implement -bios with QemuOpts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This becomes -machine bios. Signed-off-by: Paolo Bonzini --- qemu-config.c | 4 ++++ vl.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/qemu-config.c b/qemu-config.c index 3a313de..89706df 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -563,6 +563,10 @@ static QemuOptsList qemu_machine_opts = { .type = QEMU_OPT_BOOL, .help = "start machine immediately", }, { + .name = "bios", + .type = QEMU_OPT_STRING, + .help = "BIOS/firmware file", + }, { .name = "kernel_irqchip", .type = QEMU_OPT_BOOL, .help = "use KVM in-kernel irqchip", diff --git a/vl.c b/vl.c index 52a0ea6..54c5d79 100644 --- a/vl.c +++ b/vl.c @@ -2677,7 +2677,7 @@ int main(int argc, char **argv, char **envp) data_dir = optarg; break; case QEMU_OPTION_bios: - bios_name = optarg; + qemu_opts_set(qemu_find_opts("machine"), 0, "bios", optarg); break; case QEMU_OPTION_singlestep: singlestep = 1; @@ -3313,10 +3313,12 @@ int main(int argc, char **argv, char **envp) } machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0); + bios_name = NULL; kernel_filename = initrd_filename = kernel_cmdline = NULL; ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; if (machine_opts) { autostart = qemu_opt_get_bool(machine_opts, "autostart", true); + bios_name = qemu_opt_get(machine_opts, "bios"); ram_size = qemu_opt_get_size(machine_opts, "ram_size", ram_size); kernel_filename = qemu_opt_get(machine_opts, "kernel"); initrd_filename = qemu_opt_get(machine_opts, "initrd"); -- 1.7.7.6