[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/14] cmdline: implement -bios with QemuOpts
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 04/14] cmdline: implement -bios with QemuOpts |
Date: |
Wed, 11 Apr 2012 23:34:31 +0200 |
This becomes -machine bios.
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 9d48f17..eb0eee7 100644
--- a/vl.c
+++ b/vl.c
@@ -2672,7 +2672,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;
@@ -3308,10 +3308,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.9.1
- [Qemu-devel] [PATCH v2 00/14] convert many options to QemuOpts, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 01/14] QemuOpts: use strtosz, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 03/14] cmdline: implement -S with QemuOpts, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 02/14] cmdline: implement -m with QemuOpts, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 04/14] cmdline: implement -bios with QemuOpts,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 05/14] cmdline: implement -localtime with QemuOpts, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 06/14] cmdline: make -M a simple alias for -machine type, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 07/14] cmdline: accept NULL opts in qemu_opt_find, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 08/14] cmdline: implement -nodefaults with qemuopts, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 09/14] cmdline: convert -smp to QemuOpts, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 10/14] cmdline: reindent numa_add, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 11/14] cmdline: convert -numa to QemuOpts, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 13/14] cmdline: convert -smbios and -uuid to QemuOpts, Paolo Bonzini, 2012/04/11
- [Qemu-devel] [PATCH v2 12/14] cmdline: convert -acpitable to QemuOpts, Paolo Bonzini, 2012/04/11