The following changes since commit eb6490f544388dd24c0d054a96dd304bc7284450:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200703' into staging (2020-07-04 16:08:41 +0100) are available in the Git repository at: https://github.com/XanClic/qemu.git tags/pull-block-2020-07-06 for you to fetch changes up to 365fed5111b06d31c1632af63c7528dfe49d62a2: qed: Simplify backing reads (2020-07-06 10:34:14 +0200) ---------------------------------------------------------------- Block patches for 5.1: - LUKS keyslot amendment (+ patches to make the iotests pass on non-Linux systems, and to keep the tests passing for qcow v1, and to skip LUKS tests (including qcow2 LUKS) when the built qemu does not support it) - Refactoring in the block layer: Drop the basically unnecessary unallocated_blocks_are_zero field from BlockDriverInfo - Fix qcow2 preallocation when the image size is not a multiple of the cluster size - Fix in block-copy code ---------------------------------------------------------------- Alberto Garcia (1): qcow2: Fix preallocation on images with unaligned sizes Eric Blake (1): qed: Simplify backing reads Max Reitz (5): iotests: Make _filter_img_create more active iotests/common.rc: Add _require_working_luks iotests.py: Add qemu_img_pipe_and_status() iotests.py: Add (verify|has)_working_luks() iotests: Check whether luks works Maxim Levitsky (14): iotests: filter few more luks specific create options qcrypto/core: add generic infrastructure for crypto options amendment qcrypto/luks: implement encryption key management block/amend: add 'force' option block/amend: separate amend and create options for qemu-img block/amend: refactor qcow2 amend options block/crypto: rename two functions block/crypto: implement the encryption key management block/qcow2: extend qemu-img amend interface with crypto options iotests: qemu-img tests for luks key management block/core: add generic infrastructure for x-blockdev-amend qmp command block/crypto: implement blockdev-amend block/qcow2: implement blockdev-amend iotests: add tests for blockdev-amend Vladimir Sementsov-Ogievskiy (10): block/block-copy: block_copy_dirty_clusters: fix failure check qemu-img: convert: don't use unallocated_blocks_are_zero block: inline bdrv_unallocated_blocks_are_zero() block/vdi: return ZERO block-status when appropriate block/vpc: return ZERO block-status when appropriate block/crypto: drop unallocated_blocks_are_zero block/iscsi: drop unallocated_blocks_are_zero block/file-posix: drop unallocated_blocks_are_zero block/vhdx: drop unallocated_blocks_are_zero block: drop unallocated_blocks_are_zero docs/tools/qemu-img.rst | 5 +- qapi/block-core.json | 68 +++++ qapi/crypto.json | 73 +++++- qapi/job.json | 4 +- block/crypto.h | 37 +++ block/qed.h | 1 - crypto/blockpriv.h | 8 + include/block/block.h | 7 +- include/block/block_int.h | 36 ++- include/crypto/block.h | 22 ++ block.c | 19 +- block/amend.c | 113 +++++++++ block/block-copy.c | 4 +- block/crypto.c | 207 +++++++++++++-- block/file-posix.c | 3 - block/io.c | 8 +- block/iscsi.c | 1 - block/qcow2.c | 350 +++++++++++++++----------- block/qed.c | 65 +---- block/vdi.c | 3 +- block/vhdx.c | 3 - block/vpc.c | 3 +- crypto/block-luks.c | 416 ++++++++++++++++++++++++++++++- crypto/block.c | 29 +++ qemu-img.c | 48 ++-- block/Makefile.objs | 2 +- qemu-img-cmds.hx | 4 +- tests/qemu-iotests/049.out | 102 ++++---- tests/qemu-iotests/061.out | 12 +- tests/qemu-iotests/082.out | 185 ++++---------- tests/qemu-iotests/085.out | 38 +-- tests/qemu-iotests/087 | 1 + tests/qemu-iotests/087.out | 6 +- tests/qemu-iotests/112.out | 2 +- tests/qemu-iotests/125 | 24 ++ tests/qemu-iotests/125.out | 9 + tests/qemu-iotests/134.out | 2 +- tests/qemu-iotests/141 | 2 +- tests/qemu-iotests/144.out | 4 +- tests/qemu-iotests/146 | 60 +++-- tests/qemu-iotests/146.out | 405 ++++++++++++++++++++++++++++-- tests/qemu-iotests/153 | 9 +- tests/qemu-iotests/158.out | 4 +- tests/qemu-iotests/178 | 1 + tests/qemu-iotests/182.out | 2 +- tests/qemu-iotests/185.out | 8 +- tests/qemu-iotests/188 | 1 + tests/qemu-iotests/188.out | 2 +- tests/qemu-iotests/189 | 1 + tests/qemu-iotests/189.out | 4 +- tests/qemu-iotests/198 | 1 + tests/qemu-iotests/198.out | 4 +- tests/qemu-iotests/206 | 1 + tests/qemu-iotests/255.out | 8 +- tests/qemu-iotests/263 | 1 + tests/qemu-iotests/263.out | 4 +- tests/qemu-iotests/274.out | 46 ++-- tests/qemu-iotests/280.out | 2 +- tests/qemu-iotests/284 | 1 + tests/qemu-iotests/284.out | 6 +- tests/qemu-iotests/293 | 208 ++++++++++++++++ tests/qemu-iotests/293.out | 99 ++++++++ tests/qemu-iotests/294 | 90 +++++++ tests/qemu-iotests/294.out | 30 +++ tests/qemu-iotests/295 | 280 +++++++++++++++++++++ tests/qemu-iotests/295.out | 40 +++ tests/qemu-iotests/296 | 234 +++++++++++++++++ tests/qemu-iotests/296.out | 33 +++ tests/qemu-iotests/common.filter | 106 ++++++-- tests/qemu-iotests/common.rc | 30 +++ tests/qemu-iotests/group | 4 + tests/qemu-iotests/iotests.py | 84 +++++-- 72 files changed, 3103 insertions(+), 632 deletions(-) create mode 100644 block/amend.c create mode 100755 tests/qemu-iotests/293 create mode 100644 tests/qemu-iotests/293.out create mode 100755 tests/qemu-iotests/294 create mode 100644 tests/qemu-iotests/294.out create mode 100755 tests/qemu-iotests/295 create mode 100644 tests/qemu-iotests/295.out create mode 100755 tests/qemu-iotests/296 create mode 100644 tests/qemu-iotests/296.out -- 2.26.2