The following changes since commit 2a190a7256a3e0563b29ffd67e0164097b4a6dac:
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/renesas-fixes-20201109' into staging (2020-11-09 11:20:25 +0000) are available in the Git repository at: https://github.com/XanClic/qemu.git tags/pull-block-2020-11-09-v2 for you to fetch changes up to d669ed6ab028497d634e1f236c74a98725f9e45f: block: make bdrv_drop_intermediate() less wrong (2020-11-09 18:43:31 +0100) ---------------------------------------------------------------- Block patches for 5.2.0-rc1: - Some nvme fixes (addressing problems spotted by Coverity) - Fix nfs compiling on mingw (and enable it in Cirrus) - Fix an error path in bdrv_co_invalidate_cache() (permission update was initiated, but not aborted) - Fix (on-error) roll back in bdrv_drop_intermediate(): Instead of inlining bdrv_replace_node() (wrongly), call that function - Fix for iotest 240 - Fix error handling in bdrv_getlength() - Be more explicit about how QCowL2Meta objects are handled - Cleanups ---------------------------------------------------------------- v2: - Added missing Message-Id and Signed-off-by to patch 12 ---------------------------------------------------------------- Alberto Garcia (1): qcow2: Document and enforce the QCowL2Meta invariants AlexChen (1): block: Remove unused include Eric Blake (1): block: Fix integer promotion error in bdrv_getlength() Greg Kurz (1): block: Move bdrv_drain_all_end_quiesce() to block_int.h Klaus Jensen (3): hw/block/nvme: fix null ns in register namespace hw/block/nvme: fix uint16_t use of uint32_t sgls member hw/block/nvme: fix free of array-typed value Maxim Levitsky (2): iotests: add filter_qmp_virtio_scsi function iotests: rewrite iotest 240 in python Vladimir Sementsov-Ogievskiy (3): block: add forgotten bdrv_abort_perm_update() to bdrv_co_invalidate_cache() block: add bdrv_replace_node_common() block: make bdrv_drop_intermediate() less wrong Yonggang Luo (2): block: Fixes nfs compiling error on msys2/mingw block: enable libnfs on msys2/mingw in cirrus.yml shiliyang (1): block: Fix some code style problems, "foo* bar" should be "foo *bar" block/qcow2.h | 25 ++-- include/block/block.h | 6 - include/block/block_int.h | 9 ++ block.c | 89 ++++++++------ block/blkdebug.c | 2 +- block/dmg-lzfse.c | 1 - block/dmg.c | 2 +- block/nfs.c | 13 +- block/qcow2-cluster.c | 5 +- block/qcow2.c | 23 +++- block/vpc.c | 10 +- hw/block/nvme.c | 6 +- .cirrus.yml | 1 + tests/qemu-iotests/240 | 219 ++++++++++++++-------------------- tests/qemu-iotests/240.out | 76 ++++++------ tests/qemu-iotests/iotests.py | 10 ++ 16 files changed, 259 insertions(+), 238 deletions(-) -- 2.28.0
