diff options
author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-01-06 14:09:51 +0100 |
---|---|---|
committer | Max Reitz <mreitz@redhat.com> | 2020-01-06 14:14:41 +0100 |
commit | 75ab574b4c722e96d56b7f787a531981f659b5f8 (patch) | |
tree | e1241226c67bf43f8d9b22095634daccd00f060a /tests/qemu-iotests/check | |
parent | 19959445f5310f713c58cb1f5c9c3bcca6f97f95 (diff) | |
download | qemu-75ab574b4c722e96d56b7f787a531981f659b5f8.zip qemu-75ab574b4c722e96d56b7f787a531981f659b5f8.tar.gz qemu-75ab574b4c722e96d56b7f787a531981f659b5f8.tar.bz2 |
tests/qemu-iotests: Update tests to recent desugarized -accel option
Commit 6f6e1698a6 desugarized "-machine accel=" to a list
of "-accel" options. Since now "-machine accel" and "-accel"
became incompatible, update the iotests to the new format.
Error reported here:
https://gitlab.com/qemu-project/qemu/-/jobs/385801004#L3400
Reported-by: GitLab CI
Fixes: 6f6e1698a6 (vl: configure accelerators from -accel options)
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200106130951.29873-1-philmd@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/check')
-rwxr-xr-x | tests/qemu-iotests/check | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 90970b0..2890785 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -587,13 +587,13 @@ export QEMU_PROG="$(type -p "$QEMU_PROG")" case "$QEMU_PROG" in *qemu-system-arm|*qemu-system-aarch64) - export QEMU_OPTIONS="-nodefaults -display none -machine virt,accel=qtest" + export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel qtest" ;; *qemu-system-tricore) - export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard,accel=qtest" + export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard -accel qtest" ;; *) - export QEMU_OPTIONS="-nodefaults -display none -machine accel=qtest" + export QEMU_OPTIONS="-nodefaults -display none -accel qtest" ;; esac |