[PULL,for-2.10,1/1] boot-serial-test: fallback to kvm accelerator

Message ID 20170811140627.22421-2-cohuck@redhat.com
State New
Headers show

Commit Message

Cornelia Huck Aug. 11, 2017, 2:06 p.m.
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>
---
 tests/boot-serial-test.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch

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);