diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-11-13 10:10:47 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-17 19:32:26 +0100 |
| commit | 6f6e1698a68ceb49e57676528612f22eaf2c16c3 (patch) | |
| tree | f6d9b5d646eaec9965450b044957b02ebf827182 /tests/boot-serial-test.c | |
| parent | e5db4bd863c8fdf155b003446b98a7aec65a931c (diff) | |
| download | focaccia-qemu-6f6e1698a68ceb49e57676528612f22eaf2c16c3.tar.gz focaccia-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/boot-serial-test.c')
| -rw-r--r-- | tests/boot-serial-test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index d3a54a0ba5..05c7f44457 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -215,9 +215,9 @@ static void test_machine(const void *data) * Make sure that this test uses tcg if available: It is used as a * fast-enough smoketest for that. */ - qts = qtest_initf("%s %s -M %s,accel=tcg:kvm -no-shutdown " + qts = qtest_initf("%s %s -M %s -no-shutdown " "-chardev file,id=serial0,path=%s " - "-serial chardev:serial0 %s", + "-serial chardev:serial0 -accel tcg -accel kvm %s", codeparam, code ? codetmp : "", test->machine, serialtmp, test->extra); if (code) { |