The following changes since commit 9db3065c62a983286d06c207f4981408cf42184d:
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.1-pull-request' into staging (2021-07-08 16:30:18 +0100) are available in the Git repository at: https://repo.or.cz/qemu/ericb.git tags/pull-nbd-2021-07-09 for you to fetch changes up to 62967c9927ec4d733b923c70f9f5428dd1d2e0d7: nbd: register yank function earlier (2021-07-09 08:27:33 -0500) ---------------------------------------------------------------- nbd patches for 2021-07-09 - enhance 'qemu-img map --output=json' to make it easier to duplicate backing chain allocation patterns - fix a race in the 'yank' QMP command in relation to NBD requests ---------------------------------------------------------------- Eric Blake (3): iotests: Improve and rename test 309 to nbd-qemu-allocation qemu-img: Make unallocated part of backing chain obvious in map qemu-img: Reword 'qemu-img map --output=json' docs Lukas Straub (1): nbd: register yank function earlier docs/tools/qemu-img.rst | 17 +- qapi/block-core.json | 7 +- block/nbd.c | 8 +- qemu-img.c | 7 +- tests/qemu-iotests/122.out | 84 ++++----- tests/qemu-iotests/154.out | 190 +++++++++++---------- tests/qemu-iotests/179.out | 133 ++++++++++----- tests/qemu-iotests/209.out | 4 +- tests/qemu-iotests/223.out | 56 +++--- tests/qemu-iotests/244.out | 23 +-- tests/qemu-iotests/252.out | 10 +- tests/qemu-iotests/274.out | 48 +++--- tests/qemu-iotests/291.out | 24 +-- tests/qemu-iotests/309.out | 22 --- .../{309 => tests/nbd-qemu-allocation} | 5 +- tests/qemu-iotests/tests/nbd-qemu-allocation.out | 32 ++++ 16 files changed, 372 insertions(+), 298 deletions(-) delete mode 100644 tests/qemu-iotests/309.out rename tests/qemu-iotests/{309 => tests/nbd-qemu-allocation} (95%) create mode 100644 tests/qemu-iotests/tests/nbd-qemu-allocation.out -- 2.31.1
