Commit 9de36b1a authored by Peter Maydell's avatar Peter Maydell Committed by Andrzej Zaborowski
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarAndrzej Zaborowski <andrew.zaborowski@intel.com>
parent da93318a

qemu-config.c

+1 −0
Original line number Diff line number Diff line
@@ -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 = {

        {

vl.c

+0 −2
Original line number Diff line number Diff line
@@ -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);