[Qemu-devel] [PULL 0/4] NBD patches for 2019-02-11

[Eric Blake]

The following changes since commit 22c5f446514a2a4bb0dbe1fea26713da92fc85fa:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190211' into 
staging (2019-02-11 17:04:57 +0000)

are available in the Git repository at:

  https://repo.or.cz/qemu/ericb.git tags/pull-nbd-2019-02-11

for you to fetch changes up to ddd113beedd22908e676d53803843d2f85bf91ab:

  qcow2: list of bitmaps new test 242 (2019-02-11 14:35:43 -0600)

----------------------------------------------------------------
nbd patches for 2019-02-11

- Add qcow2 bitmap details to 'qemu-img info'

----------------------------------------------------------------
Andrey Shinkevich (3):
      bdrv_query_image_info Error parameter added
      qcow2: Add list of bitmaps to ImageInfoSpecificQCow2
      qcow2: list of bitmaps new test 242

Eric Blake (1):
      nbd/server: Kill pointless shadowed variable

 qapi/block-core.json       |  41 ++++++++++-
 block/qcow2.h              |   2 +
 include/block/block.h      |   3 +-
 include/block/block_int.h  |   3 +-
 block.c                    |   5 +-
 block/crypto.c             |   9 +--
 block/qapi.c               |   7 +-
 block/qcow2-bitmap.c       |  76 +++++++++++++++++++++
 block/qcow2.c              |  21 +++++-
 block/vmdk.c               |   3 +-
 nbd/server.c               |   1 -
 qemu-io-cmds.c             |   7 +-
 tests/qemu-iotests/242     | 104 ++++++++++++++++++++++++++++
 tests/qemu-iotests/242.out | 166 +++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/group   |   1 +
 15 files changed, 431 insertions(+), 18 deletions(-)
 create mode 100755 tests/qemu-iotests/242
 create mode 100644 tests/qemu-iotests/242.out

-- 
2.20.1