From 9de36b1a7cf61aa8be365f13c81668b3e19fbc7f Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 8 Feb 2012 05:41:38 +0000 Subject: [PATCH] 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 Signed-off-by: Andrzej Zaborowski --- qemu-config.c | 1 + vl.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/qemu-config.c b/qemu-config.c index 12f5c27535..c9763e0b93 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 = { { diff --git a/vl.c b/vl.c index 0e8425e35e..37f2f96928 100644 --- a/vl.c +++ b/vl.c @@ -2882,12 +2882,10 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_enable_kvm: olist = qemu_find_opts("machine"); - qemu_opts_reset(olist); qemu_opts_parse(olist, "accel=kvm", 0); break; case QEMU_OPTION_machine: olist = qemu_find_opts("machine"); - qemu_opts_reset(olist); opts = qemu_opts_parse(olist, optarg, 1); if (!opts) { fprintf(stderr, "parse error: %s\n", optarg);