Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Ari Sundholm <ari@tuxera.com>, Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>, Paolo Bonzini <pbonzini@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, John Snow <jsnow@redhat.com>, Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>, "Denis V. Lunev" <den@openvz.org>, Wen Congyang <wencongyang2@huawei.com>, Xie Changlong <xiechanglong.d@gmail.com>, Stefan Weil <sw@weilnetz.de>, Jeff Cody <codyprime@gmail.com>, Fam Zheng <fam@euphon.net>, Markus Armbruster <armbru@redhat.com>, Eric Blake <eblake@redhat.com>
block.c | 871 ++++++++++--------
block/blkdebug.c | 9 +-
block/blklogwrites.c | 11 +-
block/blkreplay.c | 7 +-
block/blkverify.c | 9 +-
block/block-backend.c | 11 +-
block/bochs.c | 7 +-
block/cloop.c | 7 +-
block/commit.c | 1 +
block/copy-before-write.c | 24 +-
block/copy-on-read.c | 9 +-
block/crypto.c | 11 +-
block/dmg.c | 7 +-
block/export/export.c | 31 +
block/filter-compress.c | 6 +-
block/mirror.c | 1 +
block/monitor/block-hmp-cmds.c | 2 +-
block/parallels.c | 7 +-
block/preallocate.c | 9 +-
block/qcow.c | 6 +-
block/qcow2.c | 8 +-
block/qed.c | 8 +-
block/raw-format.c | 4 +-
block/replication.c | 8 +-
block/snapshot.c | 60 +-
block/throttle.c | 8 +-
block/vdi.c | 7 +-
block/vhdx.c | 7 +-
block/vmdk.c | 7 +-
block/vpc.c | 7 +-
blockdev.c | 842 +++++++++--------
include/block/block-common.h | 47 +-
include/block/block-global-state.h | 24 +-
include/block/block_int-common.h | 36 +-
include/block/block_int-global-state.h | 3 +-
include/block/block_int-io.h | 1 +
include/block/export.h | 1 +
include/sysemu/block-backend-global-state.h | 3 +-
qapi/block-core.json | 73 +-
qapi/transaction.json | 35 +-
stubs/blk-by-qdev-id.c | 9 +
stubs/blk-exp-find-by-blk.c | 9 +
stubs/meson.build | 2 +
tests/qemu-iotests/iotests.py | 23 +
.../tests/blockdev-add-transaction | 52 ++
.../tests/blockdev-add-transaction.out | 6 +
tests/qemu-iotests/tests/filter-insertion | 253 +++++
tests/qemu-iotests/tests/filter-insertion.out | 5 +
tests/qemu-iotests/tests/image-fleecing | 20 +-
tests/qemu-iotests/tests/image-fleecing.out | 8 -
tests/unit/test-bdrv-drain.c | 11 +-
tests/unit/test-bdrv-graph-mod.c | 94 +-
52 files changed, 1725 insertions(+), 1002 deletions(-)
create mode 100644 stubs/blk-by-qdev-id.c
create mode 100644 stubs/blk-exp-find-by-blk.c
create mode 100755 tests/qemu-iotests/tests/blockdev-add-transaction
create mode 100644 tests/qemu-iotests/tests/blockdev-add-transaction.out
create mode 100755 tests/qemu-iotests/tests/filter-insertion
create mode 100644 tests/qemu-iotests/tests/filter-insertion.out