diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2017-10-06 16:32:08 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-10-06 16:32:08 +0200 |
| commit | fc3fd63fc0573ffd2ee569591a2e7f6c7310fd18 (patch) | |
| tree | 1ba071735ea70c9095cd9ab33d6b8a32f21585f7 /tests | |
| parent | 461743390d3a1ceafa4503811adbc87c7d372741 (diff) | |
| parent | ce960aa9062a407d0ca15aee3dcd3bd84a4e24f9 (diff) | |
| download | focaccia-qemu-fc3fd63fc0573ffd2ee569591a2e7f6c7310fd18.tar.gz focaccia-qemu-fc3fd63fc0573ffd2ee569591a2e7f6c7310fd18.zip | |
Merge remote-tracking branch 'mreitz/tags/pull-block-2017-10-06' into queue-block
Block patches # gpg: Signature made Fri Oct 6 16:30:57 2017 CEST # gpg: using RSA key F407DB0061D5CF40 # gpg: Good signature from "Max Reitz <mreitz@redhat.com>" # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40 * mreitz/tags/pull-block-2017-10-06: block/mirror: check backing in bdrv_mirror_top_flush qcow2: truncate the tail of the image file after shrinking the image qcow2: fix return error code in qcow2_truncate() iotests: Fix 195 if IMGFMT is part of TEST_DIR block/mirror: check backing in bdrv_mirror_top_refresh_filename block: support passthrough of BDRV_REQ_FUA in crypto driver block: convert qcrypto_block_encrypt|decrypt to take bytes offset block: convert crypto driver to bdrv_co_preadv|pwritev block: fix data type casting for crypto payload offset crypto: expose encryption sector size in APIs block: use 1 MB bounce buffers for crypto instead of 16KB Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/195 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 index 05a239cbf5..e7a403ded2 100755 --- a/tests/qemu-iotests/195 +++ b/tests/qemu-iotests/195 @@ -44,15 +44,16 @@ _supported_os Linux function do_run_qemu() { - echo Testing: "$@" | _filter_imgfmt + echo Testing: "$@" $QEMU -nographic -qmp-pretty stdio -serial none "$@" echo } function run_qemu() { - do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp \ - | _filter_qemu_io | _filter_generated_node_ids + do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_imgfmt | _filter_qemu \ + | _filter_qmp | _filter_qemu_io \ + | _filter_generated_node_ids } size=64M |