diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-01-28 12:30:30 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-28 12:30:30 +0000 |
| commit | 0bcd12fb1513bad44f05f2d3a8eef2a99b3077b6 (patch) | |
| tree | f3649aab45324e1d448b67a7dc1139edf7919374 /tests/qemu-iotests/iotests.py | |
| parent | 091f255b89e818b84cd003c1da552b6dc3fe3cbd (diff) | |
| parent | a44be0334beae3a9affb4a3a92cc6852993d7a84 (diff) | |
| download | focaccia-qemu-0bcd12fb1513bad44f05f2d3a8eef2a99b3077b6.tar.gz focaccia-qemu-0bcd12fb1513bad44f05f2d3a8eef2a99b3077b6.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches: - Fix crash on write to read-only devices - iotests: Rewrite 'check' in Python, get rid of 'groups' and allow non-numeric test case names # gpg: Signature made Wed 27 Jan 2021 19:56:00 GMT # gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6 # gpg: issuer "kwolf@redhat.com" # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full] # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: iotests: rename and move 169 and 199 tests iotests: rewrite check into python iotests: add testrunner.py iotests: add testenv.py iotests: add findtests.py iotests: 146: drop extra whitespaces from .out file virtio-scsi-test: Test writing to scsi-cd device block: Separate blk_is_writable() and blk_supports_write_perm() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qemu-iotests/iotests.py')
| -rw-r--r-- | tests/qemu-iotests/iotests.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 335e6feb70..00be68eca3 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -1131,6 +1131,13 @@ def _verify_formats(required_formats: Sequence[str] = ()) -> None: if usf_list: notrun(f'formats {usf_list} are not whitelisted') + +def _verify_virtio_blk() -> None: + out = qemu_pipe('-M', 'none', '-device', 'help') + if 'virtio-blk' not in out: + notrun('Missing virtio-blk in QEMU binary') + + def supports_quorum(): return 'quorum' in qemu_img_pipe('--help') @@ -1308,6 +1315,7 @@ def execute_setup_common(supported_fmts: Sequence[str] = (), _verify_cache_mode(supported_cache_modes) _verify_aio_mode(supported_aio_modes) _verify_formats(required_fmts) + _verify_virtio_blk() return debug |