tree 18f07ab85fab832f67274616e533cdc05a12d8be
parent da93318a9f0ff83e4a93e8755fa92291f9b8cc1b
author Peter Maydell <peter.maydell@linaro.org> 1328679698 +0000
committer Andrzej Zaborowski <balrogg@gmail.com> 1329466213 +0100

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>