Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, John Snow <jsnow@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>, Ronnie Sahlberg <ronniesahlberg@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Peter Lieven <pl@kamp.de>, Eric Blake <eblake@redhat.com>, "Denis V. Lunev" <den@openvz.org>, Alberto Garcia <berto@igalia.com>, Ilya Dryomov <idryomov@gmail.com>, Wen Congyang <wencongyang2@huawei.com>, Xie Changlong <xiechanglong.d@gmail.com>, Stefan Weil <sw@weilnetz.de>, Jeff Cody <codyprime@gmail.com>, Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Leonardo Bras <leobras@redhat.com>, Cleber Rosa <crosa@redhat.com>
block/qcow2.h | 187 ++++++++++++++++------------
block/vhdx.h | 5 +-
include/block/block-common.h | 7 +-
include/block/block-global-state.h | 34 ++---
include/block/block-io.h | 71 +++++++----
include/block/block_int-common.h | 69 +++++-----
include/block/block_int-io.h | 7 +-
include/block/graph-lock.h | 3 +-
include/block/qapi.h | 23 ++--
include/block/snapshot.h | 24 ++--
include/sysemu/block-backend-global-state.h | 4 +-
block.c | 120 ++++++++++++------
block/backup.c | 1 +
block/block-backend.c | 9 +-
block/bochs.c | 2 +
block/cloop.c | 2 +
block/commit.c | 1 +
block/copy-before-write.c | 2 +-
block/copy-on-read.c | 8 +-
block/crypto.c | 4 +-
block/curl.c | 2 +
block/dmg.c | 2 +
block/export/export.c | 4 +
block/gluster.c | 2 +
block/graph-lock.c | 3 +-
block/io.c | 143 ++++++++++-----------
block/iscsi.c | 2 +
block/mirror.c | 10 +-
block/monitor/block-hmp-cmds.c | 5 +
block/nbd.c | 3 +-
block/nfs.c | 2 +-
block/parallels.c | 3 +
block/qapi-sysemu.c | 11 +-
block/qapi.c | 11 +-
block/qcow.c | 3 +
block/qcow2-bitmap.c | 38 +++---
block/qcow2-cache.c | 11 +-
block/qcow2-cluster.c | 62 ++++-----
block/qcow2-refcount.c | 80 ++++++------
block/qcow2.c | 77 +++++++-----
block/quorum.c | 4 +-
block/raw-format.c | 2 +
block/rbd.c | 4 +
block/replication.c | 29 +++--
block/snapshot.c | 54 ++++++--
block/stream.c | 8 +-
block/vdi.c | 3 +
block/vhdx.c | 4 +
block/vmdk.c | 53 +++++---
block/vpc.c | 3 +
block/vvfat.c | 20 +--
blockdev.c | 44 +++++++
blockjob.c | 1 +
migration/block.c | 2 +
migration/migration-hmp-cmds.c | 2 +
qemu-img.c | 16 +++
qemu-io-cmds.c | 3 +
tests/unit/test-bdrv-drain.c | 15 ++-
tests/unit/test-block-iothread.c | 8 ++
scripts/block-coroutine-wrapper.py | 10 +-
60 files changed, 843 insertions(+), 499 deletions(-)