diff options
| -rw-r--r-- | qemu-config.c | 1 | ||||
| -rw-r--r-- | vl.c | 2 |
2 files changed, 1 insertions, 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); |