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: https://github.com/XanClic/qemu.git tags/pull-block-2020-03-11 for you to fetch changes up to 397f4e9d83e9c0000905f0a988ba1aeda162571c: block/block-copy: hide structure definitions (2020-03-11 12:42:30 +0100) ---------------------------------------------------------------- Block patches for the 5.0 softfreeze: - qemu-img measure for LUKS - Improve block-copy's performance by reducing inter-request dependencies - Make curl's detection of accept-ranges more robust - Memleak fixes - iotest fix ---------------------------------------------------------------- David Edmondson (2): block/curl: HTTP header fields allow whitespace around values block/curl: HTTP header field names are case insensitive Eric Blake (1): iotests: Fix nonportable use of od --endian Pan Nengyuan (2): block/qcow2: do free crypto_opts in qcow2_close() qemu-img: free memory before re-assign Stefan Hajnoczi (4): luks: extract qcrypto_block_calculate_payload_offset() luks: implement .bdrv_measure() qemu-img: allow qemu-img measure --object without a filename iotests: add 288 luks qemu-img measure test Vladimir Sementsov-Ogievskiy (10): block/qcow2-threads: fix qcow2_decompress job: refactor progress to separate object block/block-copy: fix progress calculation block/block-copy: specialcase first copy_range request block/block-copy: use block_status block/block-copy: factor out find_conflicting_inflight_req block/block-copy: refactor interfaces to use bytes instead of end block/block-copy: rename start to offset in interfaces block/block-copy: reduce intersecting request lock block/block-copy: hide structure definitions block/backup-top.c | 6 +- block/backup.c | 38 ++- block/block-copy.c | 405 ++++++++++++++++++++++++------- block/crypto.c | 62 +++++ block/curl.c | 32 ++- block/qcow2-threads.c | 12 +- block/qcow2.c | 75 ++---- block/trace-events | 1 + blockjob.c | 16 +- crypto/block.c | 36 +++ include/block/block-copy.h | 65 +---- include/crypto/block.h | 22 ++ include/qemu/job.h | 11 +- include/qemu/progress_meter.h | 58 +++++ job-qmp.c | 4 +- job.c | 6 +- qemu-img.c | 14 +- tests/qemu-iotests/178 | 2 +- tests/qemu-iotests/178.out.qcow2 | 8 +- tests/qemu-iotests/178.out.raw | 8 +- tests/qemu-iotests/288 | 93 +++++++ tests/qemu-iotests/288.out | 30 +++ tests/qemu-iotests/common.rc | 22 +- tests/qemu-iotests/group | 1 + 24 files changed, 749 insertions(+), 278 deletions(-) create mode 100644 include/qemu/progress_meter.h create mode 100755 tests/qemu-iotests/288 create mode 100644 tests/qemu-iotests/288.out -- 2.24.1
