summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorCornelia Huck2017-08-11 13:03:31 +0200
committerCornelia Huck2017-08-11 15:44:05 +0200
commit480bc11e61693796debd3a9566be0ca1795bb7b7 (patch)
treed4470261eb3ead6867162bf41261991e661a40fc /tests
parentMerge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (diff)
downloadqemu-480bc11e61693796debd3a9566be0ca1795bb7b7.tar.gz
qemu-480bc11e61693796debd3a9566be0ca1795bb7b7.tar.xz
qemu-480bc11e61693796debd3a9566be0ca1795bb7b7.zip
boot-serial-test: fallback to kvm accelerator
Currently, at least x86_64 and s390x support building with --disable-tcg. Instead of forcing tcg (which causes the test to fail on such builds), allow to use kvm as well. Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/boot-serial-test.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
index 11f48b049c..a8ca877168 100644
--- a/tests/boot-serial-test.c
+++ b/tests/boot-serial-test.c
@@ -78,8 +78,9 @@ static void test_machine(const void *data)
fd = mkstemp(tmpname);
g_assert(fd != -1);
- args = g_strdup_printf("-M %s,accel=tcg -chardev file,id=serial0,path=%s"
- " -no-shutdown -serial chardev:serial0 %s",
+ args = g_strdup_printf("-M %s,accel=kvm:tcg "
+ "-chardev file,id=serial0,path=%s "
+ "-no-shutdown -serial chardev:serial0 %s",
test->machine, tmpname, test->extra);
qtest_start(args);