Speed up tests on host systems with kvm support.
In particular, this fixes tests with --disable-tcg.
Cc: Paolo Bonzini <pbonz...@redhat.com>
Cc: Thomas Huth <th...@redhat.com>
Cc: Laurent Vivier <lviv...@redhat.com>
Suggested-by: Cornelia Huck <coh...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
---
Tested on x86 only.
tests/boot-serial-test.c | 2 +-
tests/pnv-xscom-test.c | 4 ++--
tests/prom-env-test.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
index 11f48b0..c3b2e4e 100644
--- a/tests/boot-serial-test.c
+++ b/tests/boot-serial-test.c
@@ -78,7 +78,7 @@ 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"
+ 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);
diff --git a/tests/pnv-xscom-test.c b/tests/pnv-xscom-test.c
index 5adc3fd..7be396f 100644
--- a/tests/pnv-xscom-test.c
+++ b/tests/pnv-xscom-test.c
@@ -84,7 +84,7 @@ static void test_cfam_id(const void *data)
char *args;
const PnvChip *chip = data;
- args = g_strdup_printf("-M powernv,accel=tcg -cpu %s", chip->cpu_model);
+ args = g_strdup_printf("-M powernv,accel=kvm:tcg -cpu %s",
chip->cpu_model);
qtest_start(args);
test_xscom_cfam_id(chip);
@@ -112,7 +112,7 @@ static void test_core(const void *data)
char *args;
const PnvChip *chip = data;
- args = g_strdup_printf("-M powernv,accel=tcg -cpu %s", chip->cpu_model);
+ args = g_strdup_printf("-M powernv,accel=kvm:tcg -cpu %s",
chip->cpu_model);
qtest_start(args);
test_xscom_core(chip);
diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c
index eac207b..0a10f06 100644
--- a/tests/prom-env-test.c
+++ b/tests/prom-env-test.c
@@ -50,7 +50,7 @@ static void test_machine(const void *machine)
/* The pseries firmware boots much faster without the default devices */
extra_args = strcmp(machine, "pseries") == 0 ? "-nodefaults" : "";
- args = g_strdup_printf("-M %s,accel=tcg %s -prom-env 'use-nvramrc?=true' "
+ args = g_strdup_printf("-M %s,accel=kvm:tcg %s -prom-env
'use-nvramrc?=true' "
"-prom-env 'nvramrc=%x %x l!' ",
(const char *)machine, extra_args, MAGIC, ADDRESS);
--
MST
