Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>, John Snow <jsnow@redhat.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
qapi/block-core.json | 66 +++++++++++++++++++++
docs/tools/qemu-img.rst | 6 +-
include/block/accounting.h | 5 +-
include/block/block_int-common.h | 35 +++++++-----
include/block/block_int-io.h | 6 ++
include/block/qapi.h | 2 +-
include/hw/block/block.h | 7 ++-
block.c | 12 ++++
block/accounting.c | 17 +++++-
block/crypto.c | 32 ++++++++---
block/curl.c | 2 +-
block/io.c | 9 +--
block/monitor/block-hmp-cmds.c | 45 ++++++++-------
block/qapi.c | 66 +++++++++++++++++++--
blockdev.c | 3 +-
hw/block/block.c | 7 ++-
qemu-img.c | 40 ++++++++++---
MAINTAINERS | 2 +-
qemu-img-cmds.hx | 4 +-
tests/qemu-iotests/094.out | 2 +-
tests/qemu-iotests/119.out | 2 +-
tests/qemu-iotests/172.out | 38 ++++++++++++
tests/qemu-iotests/184 | 5 +-
tests/qemu-iotests/184.out | 8 ---
tests/qemu-iotests/267.out | 8 +--
tests/qemu-iotests/common.filter | 3 +-
tests/qemu-iotests/tests/fuse-allow-other.out | 6 +-
tests/qemu-iotests/tests/inactive-node-nbd | 1 +
tests/qemu-iotests/tests/resize-below-filter | 73 ++++++++++++++++++++++++
tests/qemu-iotests/tests/resize-below-filter.out | 5 ++
tests/qemu-iotests/tests/resize-below-raw | 53 +++++++++++++++++
tests/qemu-iotests/tests/resize-below-raw.out | 5 ++
32 files changed, 479 insertions(+), 96 deletions(-)
create mode 100755 tests/qemu-iotests/tests/resize-below-filter
create mode 100644 tests/qemu-iotests/tests/resize-below-filter.out
create mode 100755 tests/qemu-iotests/tests/resize-below-raw
create mode 100644 tests/qemu-iotests/tests/resize-below-raw.out