f75d152 Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Merged and Committed by Peter Maydell 4 years ago
75 files changed. 696 lines added. 519 lines removed.
block.c
file modified
+2 -10
block/backup.c
file modified
+6 -8
block/commit.c
file modified
+5 -3
block/parallels.c
file modified
+6 -8
block/qapi.c
file modified
+11 -38
block/qcow.c
file modified
+6 -13
block/qcow2.c
file modified
+42 -38
block/qed-check.c
file modified
+2 -2
block/qed-table.c
file modified
+25 -20
block/qed.c
file modified
+5 -6
block/qed.h
file modified
+16 -12
block/stream.c
file modified
+1 -3
block/vhdx-log.c
file modified
+1 -1
block/vhdx.c
file modified
+4 -3
block/vhdx.h
file modified
+7 -9
block/vmdk.c
file modified
+2 -0
block/vpc.c
file modified
+4 -0
include/block/block_int.h
file modified
+16 -0
include/sysemu/block-backend.h
file modified
+19 -0
qemu-img.c
file modified
+16 -10
tests/qemu-iotests/026.out
file modified
+84 -84
tests/qemu-iotests/043.out
file modified
+3 -3
tests/qemu-iotests/053.out
file modified
+1 -1
tests/qemu-iotests/059.out
file modified
+5 -5
tests/qemu-iotests/060.out
file modified
+8 -8
tests/qemu-iotests/061.out
file modified
+6 -6
tests/qemu-iotests/069.out
file modified
+1 -1
tests/qemu-iotests/070.out
file modified
+2 -2
tests/qemu-iotests/075.out
file modified
+7 -7
tests/qemu-iotests/076.out
file modified
+3 -3
tests/qemu-iotests/078.out
file modified
+6 -6
tests/qemu-iotests/080.out
file modified
+20 -20
tests/qemu-iotests/081.out
file modified
+1 -1
tests/qemu-iotests/082
file modified
+4 -1
tests/qemu-iotests/082.out
file modified
+31 -20
tests/qemu-iotests/084.out
file modified
+4 -4
tests/qemu-iotests/088.out
file modified
+6 -6
tests/qemu-iotests/089.out
file modified
+1 -1
tests/qemu-iotests/095.out
file modified
+2 -2
tests/qemu-iotests/103.out
file modified
+7 -7
tests/qemu-iotests/104.out
file modified
+3 -3
tests/qemu-iotests/110.out
file modified
+3 -3
tests/qemu-iotests/114.out
file modified
+2 -2
tests/qemu-iotests/116.out
file modified
+7 -7
tests/qemu-iotests/126.out
file modified
+2 -2
tests/qemu-iotests/130.out
file modified
+5 -5
tests/qemu-iotests/131.out
file modified
+1 -1
tests/qemu-iotests/133.out
file modified
+15 -15
tests/qemu-iotests/137.out
file modified
+14 -14
tests/qemu-iotests/140.out
file modified
+1 -1
tests/qemu-iotests/143.out
file modified
+1 -1
tests/qemu-iotests/153.out
file modified
+16 -16
tests/qemu-iotests/187.out
file modified
+3 -3
tests/qemu-iotests/188.out
file modified
+1 -1
tests/qemu-iotests/191.out
file modified
+4 -4
tests/qemu-iotests/195.out
file modified
+2 -2
tests/qemu-iotests/197.out
file modified
+1 -1
tests/qemu-iotests/198.out
file modified
+2 -2
tests/qemu-iotests/205
file modified
+1 -1
tests/qemu-iotests/206.out
file modified
+5 -5
tests/qemu-iotests/207.out
file modified
+6 -6
tests/qemu-iotests/210.out
file modified
+4 -4
tests/qemu-iotests/211.out
file modified
+5 -5
tests/qemu-iotests/212.out
file modified
+5 -5
tests/qemu-iotests/213.out
file modified
+5 -5
tests/qemu-iotests/215.out
file modified
+1 -1
tests/qemu-iotests/226.out
file modified
+8 -8
tests/qemu-iotests/233.out
file modified
+2 -2
tests/qemu-iotests/237.out
file modified
+11 -11
tests/qemu-iotests/242.out
file modified
+5 -5
tests/qemu-iotests/244.out
file modified
+5 -5
tests/qemu-iotests/249
file added
+115
tests/qemu-iotests/249.out
file added
+35
tests/qemu-iotests/group
file modified
+1 -0
util/cutils.c
file modified
+1 -1
    Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
    
    Block layer patches:
    
    - iotests: Fix output of qemu-io related tests
    - Don't ignore bdrv_set_aio_context() for nodes with bs->drv = NUL
    - vmdk: Set vmdk parent backing_format to vmdk
    - qcow2: Preallocation fixes (especially for external data files)
    - Add linear-buffer-based APIs (as wrappers around qiov-based ones)
    - Various code cleanups and small corner case fixes
    
    # gpg: Signature made Tue 30 Apr 2019 16:35:09 BST
    # gpg:                using RSA key 7F09B272C88F2FD6
    # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
    # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6
    
    * remotes/kevin/tags/for-upstream: (27 commits)
      block/qed: add missed coroutine_fn markers
      iotests: Check that images are in read-only mode after block-commit
      commit: Make base read-only if there is an early failure
      qemu-img: use buffer-based io
      block/stream: use buffer-based io
      block/commit: use buffer-based io
      block/backup: use buffer-based io
      block/parallels: use buffer-based io
      block/qed: use buffer-based io
      block/qcow: use buffer-based io
      block/qcow2: use buffer-based io
      block: introduce byte-based io helpers
      qcow2: Fix error handling in the compression code
      qcow2: Fix qcow2_make_empty() with external data file
      qemu-img: Make create hint at protocol options
      iotests: Perform the correct test in 082
      qcow2: Fix full preallocation with external data file
      qcow2: Add errp to preallocate_co()
      qcow2: Avoid COW during metadata preallocation
      qemu-img: Saner printing of large file sizes
      ...
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    
        
file modified
+2 -10
file modified
+6 -8
file modified
+5 -3
file modified
+6 -8
file modified
+11 -38
file modified
+6 -13
file modified
+42 -38
file modified
+2 -2
file modified
+25 -20
file modified
+5 -6
file modified
+16 -12
file modified
+1 -3
file modified
+1 -1
file modified
+4 -3
file modified
+7 -9
file modified
+2 -0
file modified
+4 -0
file modified
+16 -0
file modified
+16 -10
file modified
+84 -84
file modified
+3 -3
file modified
+1 -1
file modified
+5 -5
file modified
+8 -8
file modified
+6 -6
file modified
+1 -1
file modified
+2 -2
file modified
+7 -7
file modified
+3 -3
file modified
+6 -6
file modified
+20 -20
file modified
+1 -1
file modified
+4 -1
file modified
+31 -20
file modified
+4 -4
file modified
+6 -6
file modified
+1 -1
file modified
+2 -2
file modified
+7 -7
file modified
+3 -3
file modified
+3 -3
file modified
+2 -2
file modified
+7 -7
file modified
+2 -2
file modified
+5 -5
file modified
+1 -1
file modified
+15 -15
file modified
+14 -14
file modified
+1 -1
file modified
+1 -1
file modified
+16 -16
file modified
+3 -3
file modified
+1 -1
file modified
+4 -4
file modified
+2 -2
file modified
+1 -1
file modified
+2 -2
file modified
+1 -1
file modified
+5 -5
file modified
+6 -6
file modified
+4 -4
file modified
+5 -5
file modified
+5 -5
file modified
+5 -5
file modified
+1 -1
file modified
+8 -8
file modified
+2 -2
file modified
+11 -11
file modified
+5 -5
file modified
+5 -5
file added
+115
file modified
+1 -0
file modified
+1 -1