aboutsummaryrefslogtreecommitdiff
path: root/qemu-config.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2012-02-08 05:41:38 +0000
committerAndrzej Zaborowski <balrogg@gmail.com>2012-02-17 09:10:13 +0100
commit9de36b1a7cf61aa8be365f13c81668b3e19fbc7f (patch)
tree18f07ab85fab832f67274616e533cdc05a12d8be /qemu-config.c
parentda93318a9f0ff83e4a93e8755fa92291f9b8cc1b (diff)
downloadqemu-9de36b1a7cf61aa8be365f13c81668b3e19fbc7f.zip
qemu-9de36b1a7cf61aa8be365f13c81668b3e19fbc7f.tar.gz
qemu-9de36b1a7cf61aa8be365f13c81668b3e19fbc7f.tar.bz2
Make -machine/-enable-kvm options merge into a single list
Make the "machine" option list use list merging, so that multiple -machine arguments (and the -enable-kvm argument) all merge together into a single list. Drop the calls to qemu_opts_reset() which meant that only the last -machine or -enable-kvm option had any effect. This fixes the bug where "-enable-kvm -machine foo" would ignore the '-enable-kvm' option, and "-machine foo -enable-kvm" would ignore the '-machine foo' option. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
Diffstat (limited to 'qemu-config.c')
-rw-r--r--qemu-config.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c
index 12f5c27..c9763e0 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -547,6 +547,7 @@ QemuOptsList qemu_option_rom_opts = {
static QemuOptsList qemu_machine_opts = {
.name = "machine",
.implied_opt_name = "type",
+ .merge_lists = true,
.head = QTAILQ_HEAD_INITIALIZER(qemu_machine_opts.head),
.desc = {
{