The following changes since commit 725ca3313a5b9cbef89eaa1c728567684f37990a:
Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20201026' into staging (2020-10-27 14:29:52 +0000) are available in the Git repository at: https://repo.or.cz/qemu/ericb.git tags/pull-nbd-2020-10-27 for you to fetch changes up to a1487599cc3270ea0d435e8965ee2d6efc8f8a1a: nbd: Add 'qemu-nbd -A' to expose allocation depth (2020-10-27 16:46:21 -0500) ---------------------------------------------------------------- nbd patches for 2020-10-27 - Tweak the new block-export-add QMP command - Allow multiple -B options for qemu-nbd - Add qemu:allocation-depth metadata context as qemu-nbd -A - Improve iotest use of NBD ---------------------------------------------------------------- Eric Blake (10): block: Simplify QAPI_LIST_ADD qapi: Add QAPI_LIST_PREPEND() macro nbd: Utilize QAPI_CLONE for type conversion nbd: Update qapi to support exporting multiple bitmaps nbd: Simplify qemu bitmap context name nbd: Refactor counting of metadata contexts nbd: Allow export of multiple bitmaps for one device block: Return depth level during bdrv_is_allocated_above nbd: Add new qemu:allocation-depth metadata context nbd: Add 'qemu-nbd -A' to expose allocation depth Max Reitz (2): iotests/291: Filter irrelevant parts of img-info iotests/291: Stop NBD server docs/interop/nbd.txt | 23 +++-- docs/system/deprecated.rst | 3 +- docs/tools/qemu-nbd.rst | 8 +- qapi/block-core.json | 7 +- qapi/block-export.json | 46 +++++++--- block/coroutines.h | 6 +- include/block/nbd.h | 8 +- include/qapi/util.h | 13 +++ block/io.c | 29 +++++-- block.c | 22 ++--- block/commit.c | 2 +- block/mirror.c | 2 +- block/nbd.c | 26 ++++-- block/stream.c | 2 +- blockdev-nbd.c | 19 +++-- nbd/server.c | 208 +++++++++++++++++++++++++++++++++++---------- qemu-nbd.c | 30 ++++--- tests/qemu-iotests/291 | 22 +++-- tests/qemu-iotests/291.out | 20 ----- tests/qemu-iotests/309 | 77 +++++++++++++++++ tests/qemu-iotests/309.out | 22 +++++ tests/qemu-iotests/group | 1 + 22 files changed, 445 insertions(+), 151 deletions(-) create mode 100755 tests/qemu-iotests/309 create mode 100644 tests/qemu-iotests/309.out -- 2.29.0