diff options
| author | Peter Maydell | 2019-09-20 14:58:04 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-09-20 14:58:04 +0200 |
| commit | f5c7af6295b18c9cb9bc183648ce37481b49f432 (patch) | |
| tree | 3d9111bc513b26167b369a6acb349ad098ff55f1 /tests | |
| parent | Makefile: Fix in-tree builds when Sphinx is available (diff) | |
| parent | configure: Add xkbcommon configure options (diff) | |
| download | qemu-f5c7af6295b18c9cb9bc183648ce37481b49f432.tar.gz qemu-f5c7af6295b18c9cb9bc183648ce37481b49f432.tar.xz qemu-f5c7af6295b18c9cb9bc183648ce37481b49f432.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
Trivial patches 20190919
# gpg: Signature made Thu 19 Sep 2019 14:50:55 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
configure: Add xkbcommon configure options
kvm: Fix typo in header of kvm_device_access()
Fix cacheline detection on FreeBSD/powerpc.
build: Don't ignore qapi-visit-core.c
target/m68k/fpu_helper.c: rename the access arguments
Replace '-machine accel=xyz' with '-accel xyz'
cutils: Move size_to_str() from "qemu-common.h" to "qemu/cutils.h"
vfio: fix a typo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libqtest.c | 2 | ||||
| -rw-r--r-- | tests/migration/guestperf/engine.py | 2 | ||||
| -rwxr-xr-x | tests/qemu-iotests/172 | 2 |
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 } |