This series contains the 3 test suite patches that had to be dropped from the v6 series during merge with the block tree:
v6: https://lists.gnu.org/archive/html/qemu-devel/2016-03/msg04935.html Changed in v7: - Avoid setting TEST_IMG_FILE when IMGPROTO=file in common.rc for traditional (not --image-opts) variable setup Daniel P. Berrange (3): block: add support for --image-opts in block I/O tests block: add support for encryption secrets in block I/O tests block: enable testing of LUKS driver with block I/O tests tests/qemu-iotests/004 | 2 +- tests/qemu-iotests/012 | 2 +- tests/qemu-iotests/039.out | 20 +++++------ tests/qemu-iotests/048 | 22 ++++++++---- tests/qemu-iotests/048.out | 6 ++-- tests/qemu-iotests/052 | 4 +++ tests/qemu-iotests/052.out | 4 +++ tests/qemu-iotests/100 | 7 ++++ tests/qemu-iotests/100.out | 14 ++++++++ tests/qemu-iotests/common | 15 +++++++- tests/qemu-iotests/common.config | 21 ++++++++++-- tests/qemu-iotests/common.filter | 3 +- tests/qemu-iotests/common.rc | 74 +++++++++++++++++++++++++++++++--------- 13 files changed, 152 insertions(+), 42 deletions(-) -- 2.5.5