diff options
| author | Paolo Bonzini | 2019-11-13 10:10:47 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2019-12-17 19:32:26 +0100 |
| commit | 6f6e1698a68ceb49e57676528612f22eaf2c16c3 (patch) | |
| tree | f6d9b5d646eaec9965450b044957b02ebf827182 /tests/arm-cpu-features.c | |
| parent | vl: introduce object_parse_property_opt (diff) | |
| download | qemu-6f6e1698a68ceb49e57676528612f22eaf2c16c3.tar.gz qemu-6f6e1698a68ceb49e57676528612f22eaf2c16c3.tar.xz qemu-6f6e1698a68ceb49e57676528612f22eaf2c16c3.zip | |
vl: configure accelerators from -accel options
Drop the "accel" property from MachineState, and instead desugar
"-machine accel=" to a list of "-accel" options.
This has a semantic change due to removing merge_lists from -accel.
For example:
- "-accel kvm -accel tcg" all but ignored "-accel kvm". This is a bugfix.
- "-accel kvm -accel thread=single" ignored "thread=single", since it
applied the option to KVM. Now it fails due to not specifying the
accelerator on "-accel thread=single".
- "-accel tcg -accel thread=single" chose single-threaded TCG, while now
it will fail due to not specifying the accelerator on "-accel
thread=single".
Also, "-machine accel" and "-accel" become incompatible.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests/arm-cpu-features.c')
| -rw-r--r-- | tests/arm-cpu-features.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/arm-cpu-features.c b/tests/arm-cpu-features.c index 6e99aa951e..bef3ed24b6 100644 --- a/tests/arm-cpu-features.c +++ b/tests/arm-cpu-features.c @@ -20,8 +20,8 @@ */ #define SVE_MAX_VQ 16 -#define MACHINE "-machine virt,gic-version=max,accel=tcg " -#define MACHINE_KVM "-machine virt,gic-version=max,accel=kvm:tcg " +#define MACHINE "-machine virt,gic-version=max -accel tcg " +#define MACHINE_KVM "-machine virt,gic-version=max -accel kvm -accel tcg " #define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \ " 'arguments': { 'type': 'full', " #define QUERY_TAIL "}}" |