aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2019-09-04 07:27:39 +0200
committerLaurent Vivier <laurent@vivier.eu>2019-09-19 12:01:48 +0200
commit976e8c54142586285f71f524308e4715f6e04e2d (patch)
tree16a70fa9d8bc21c44cb51df2914aa5bdaea3d6bf /tests
parent31e404151bddbfd7215e471b5822ea2e96024e02 (diff)
Replace '-machine accel=xyz' with '-accel xyz'
We've got a separate option to configure the accelerator nowadays, which is shorter to type and the preferred way of specifying an accelerator. Use it in the source and examples to show that it is the favored option. (However, do not touch the places yet which also specify other machine options or multiple accelerators - these are currently still better handled with one single "-machine" statement instead) Signed-off-by: Thomas Huth <thuth@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20190904052739.22123-1-thuth@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'tests')
-rw-r--r--tests/libqtest.c2
-rw-r--r--tests/migration/guestperf/engine.py2
-rwxr-xr-xtests/qemu-iotests/1722
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 4a7556462d..38e4f5b587 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -241,7 +241,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
"-qtest-log %s "
"-chardev socket,path=%s,id=char0 "
"-mon chardev=char0,mode=control "
- "-machine accel=qtest "
+ "-accel qtest "
"-display none "
"%s", qemu_binary, socket_path,
getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null",
diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
index f13dbea800..1dd04ce33b 100644
--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
@@ -287,7 +287,7 @@ class Engine(object):
cmdline = "'" + cmdline + "'"
argv = [
- "-machine", "accel=kvm",
+ "-accel", "kvm",
"-cpu", "host",
"-kernel", self._kernel,
"-initrd", self._initrd,
diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
index ba7dad9057..d67997e5f6 100755
--- a/tests/qemu-iotests/172
+++ b/tests/qemu-iotests/172
@@ -55,7 +55,7 @@ do_run_qemu()
done
fi
echo quit
- ) | $QEMU -machine accel=qtest -nographic -monitor stdio -serial none "$@"
+ ) | $QEMU -accel qtest -nographic -monitor stdio -serial none "$@"
echo
}