[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] tests/qemu-iotests: Update tests to recent desugarized -accel op
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH] tests/qemu-iotests: Update tests to recent desugarized -accel option |
Date: |
Mon, 6 Jan 2020 14:09:51 +0100 |
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é <address@hidden>
---
tests/qemu-iotests/235 | 2 +-
tests/qemu-iotests/check | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
index fedd111fd4..3d7533980d 100755
--- a/tests/qemu-iotests/235
+++ b/tests/qemu-iotests/235
@@ -49,7 +49,7 @@ qemu_img_create('-f', iotests.imgfmt, '-o',
'preallocation=metadata', disk,
str(size))
vm = QEMUMachine(iotests.qemu_prog)
-vm.add_args('-machine', 'accel=kvm:tcg')
+vm.add_args('-accel', 'kvm', '-accel', 'tcg')
if iotests.qemu_default_machine == 's390-ccw-virtio':
vm.add_args('-no-shutdown')
vm.add_args('-drive', 'id=src,file=' + disk)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 90970b0549..2890785a10 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
--
2.21.1
- [PATCH] tests/qemu-iotests: Update tests to recent desugarized -accel option,
Philippe Mathieu-Daudé <=
- Re: [PATCH] tests/qemu-iotests: Update tests to recent desugarized -accel option, Max Reitz, 2020/01/06
- Priority of -accel (was: [PATCH] tests/qemu-iotests: Update tests to recent desugarized -accel option), Thomas Huth, 2020/01/07
- Re: Priority of -accel (was: [PATCH] tests/qemu-iotests: Update tests to recent desugarized -accel option), Paolo Bonzini, 2020/01/07
- Re: Priority of -accel (was: [PATCH] tests/qemu-iotests: Update tests to recent desugarized -accel option), Thomas Huth, 2020/01/07
- Re: Priority of -accel (was: [PATCH] tests/qemu-iotests: Update tests to recent desugarized -accel option), Paolo Bonzini, 2020/01/07
- Re: Priority of -accel (was: [PATCH] tests/qemu-iotests: Update tests to recent desugarized -accel option), Daniel P . Berrangé, 2020/01/07
- Re: Priority of -accel (was: [PATCH] tests/qemu-iotests: Update tests to recent desugarized -accel option), Thomas Huth, 2020/01/07
- Re: Priority of -accel, Philippe Mathieu-Daudé, 2020/01/07
- Re: Priority of -accel, Daniel P . Berrangé, 2020/01/07
- Re: Priority of -accel, Thomas Huth, 2020/01/07