The following changes since commit 7b1db0908d88f0c9cfac24e214ff72a860692e23:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180323' into staging (2018-03-25 13:51:33 +0100) are available in the git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to 0b7e7f66813a7e346e12d47be977a32a530a6316: qemu-iotests: Test vhdx image creation with QMP (2018-03-26 12:17:43 +0200) ---------------------------------------------------------------- Block layer patches ---------------------------------------------------------------- Alberto Garcia (1): qcow2: Reset free_cluster_index when allocating a new refcount block Eric Blake (1): iotests: 163 is not quick Fabiano Rosas (5): block/replication: Remove protocol_name field block/quorum: Remove protocol-related fields block/throttle: Remove protocol-related fields block/blkreplay: Remove protocol-related fields include/block/block_int: Document protocol related functions Kevin Wolf (12): vdi: Change 'static' create option to 'preallocation' in QMP vdi: Fix build with CONFIG_VDI_DEBUG qemu-iotests: Test vdi image creation with QMP qemu-iotests: Enable 025 for luks luks: Turn another invalid assertion into check qemu-iotests: Test invalid resize on luks parallels: Check maximum cluster size on create qemu-iotests: Test parallels image creation with QMP vhdx: Require power-of-two block size on create vhdx: Don't use error_setg_errno() with constant errno vhdx: Check for 4 GB maximum log size on creation qemu-iotests: Test vhdx image creation with QMP qapi/block-core.json | 7 +- include/block/block_int.h | 8 ++ replication.h | 1 - block/blkreplay.c | 3 +- block/crypto.c | 6 +- block/parallels.c | 5 + block/qcow2-refcount.c | 7 + block/quorum.c | 3 +- block/replication.c | 1 - block/throttle.c | 3 +- block/vdi.c | 46 ++++-- block/vhdx.c | 17 ++- tests/qemu-iotests/025 | 9 +- tests/qemu-iotests/026.out | 6 +- tests/qemu-iotests/121 | 20 +++ tests/qemu-iotests/121.out | 10 ++ tests/qemu-iotests/210 | 37 +++++ tests/qemu-iotests/210.out | 16 +++ tests/qemu-iotests/211 | 246 ++++++++++++++++++++++++++++++++ tests/qemu-iotests/211.out | 97 +++++++++++++ tests/qemu-iotests/212 | 326 ++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/212.out | 111 ++++++++++++++ tests/qemu-iotests/213 | 349 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/213.out | 121 ++++++++++++++++ tests/qemu-iotests/group | 5 +- 25 files changed, 1423 insertions(+), 37 deletions(-) create mode 100755 tests/qemu-iotests/211 create mode 100644 tests/qemu-iotests/211.out create mode 100755 tests/qemu-iotests/212 create mode 100644 tests/qemu-iotests/212.out create mode 100755 tests/qemu-iotests/213 create mode 100644 tests/qemu-iotests/213.out