The following changes since commit ba29883206d92a29ad5a466e679ccfc2ee6132ef:
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20200310' into staging (2020-03-10 16:50:28 +0000) are available in the Git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to 8bb3b023f2055054ee119cb45b42d2b14be7fc8a: qemu-iotests: adding LUKS cleanup for non-UTF8 secret error (2020-03-11 15:54:38 +0100) ---------------------------------------------------------------- Block layer patches: - Relax restrictions for blockdev-snapshot (allows libvirt to do live storage migration with blockdev-mirror) - luks: Delete created files when block_crypto_co_create_opts_luks fails - Fix memleaks in qmp_object_add ---------------------------------------------------------------- Daniel Henrique Barboza (4): block: introducing 'bdrv_co_delete_file' interface block.c: adding bdrv_co_delete_file crypto.c: cleanup created file when block_crypto_co_create_opts_luks fails qemu-iotests: adding LUKS cleanup for non-UTF8 secret error Kevin Wolf (6): block: Make bdrv_get_cumulative_perm() public block: Relax restrictions for blockdev-snapshot iotests: Fix run_job() with use_log=False iotests: Test mirror with temporarily disabled target backing file block: Fix cross-AioContext blockdev-snapshot iotests: Add iothread cases to 155 Pan Nengyuan (1): qom-qmp-cmds: fix two memleaks in qmp_object_add Peter Krempa (1): qapi: Add '@allow-write-only-overlay' feature for 'blockdev-snapshot' Philippe Mathieu-Daudé (1): tests/qemu-iotests: Fix socket_scm_helper build path qapi/block-core.json | 9 ++++- include/block/block.h | 1 + include/block/block_int.h | 7 ++++ block.c | 33 ++++++++++++++-- block/crypto.c | 18 +++++++++ block/file-posix.c | 23 +++++++++++ blockdev.c | 30 ++++----------- qom/qom-qmp-cmds.c | 16 +++----- tests/qemu-iotests/iotests.py | 5 ++- tests/Makefile.include | 1 + tests/qemu-iotests/085.out | 4 +- tests/qemu-iotests/155 | 88 ++++++++++++++++++++++++++++++++++++------- tests/qemu-iotests/155.out | 4 +- tests/qemu-iotests/282 | 67 ++++++++++++++++++++++++++++++++ tests/qemu-iotests/282.out | 11 ++++++ tests/qemu-iotests/group | 1 + tests/qtest/Makefile.include | 1 - 17 files changed, 262 insertions(+), 57 deletions(-) create mode 100755 tests/qemu-iotests/282 create mode 100644 tests/qemu-iotests/282.out