Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, John Snow <jsnow@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, 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>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, "Denis V. Lunev" <den@openvz.org>, Alberto Garcia <berto@igalia.com>, Wen Congyang <wencongyang2@huawei.com>, Xie Changlong <xiechanglong.d@gmail.com>, Markus Armbruster <armbru@redhat.com>, Greg Kurz <groug@kaod.org>, Christian Schoenebeck <qemu_oss@crudebyte.com>, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>
qapi/block-core.json | 10 +-
block/qcow2.h | 19 +-
hw/9pfs/9p.h | 9 +-
include/block/aio-wait.h | 17 +-
include/block/blockjob.h | 59 +++-
include/block/nbd.h | 2 +-
include/qemu/coroutine.h | 4 +-
include/qemu/job.h | 306 +++++++++++++-----
block.c | 24 +-
block/blkverify.c | 2 +-
block/block-backend.c | 10 +-
block/copy-before-write.c | 9 +-
block/curl.c | 2 +-
block/file-posix.c | 11 +-
block/io.c | 22 +-
block/iscsi.c | 3 +-
block/mirror.c | 19 +-
block/nbd.c | 11 +-
block/nfs.c | 2 +-
block/nvme.c | 54 ++--
block/parallels.c | 5 +-
block/qcow2-cluster.c | 21 +-
block/qcow2-refcount.c | 6 +-
block/qcow2.c | 5 +-
block/qed.c | 4 +-
block/quorum.c | 38 +--
block/raw-format.c | 3 +-
block/replication.c | 3 +
block/throttle.c | 2 +-
block/vmdk.c | 22 +-
blockdev.c | 129 ++++----
blockjob.c | 132 ++++----
job-qmp.c | 92 +++---
job.c | 674 +++++++++++++++++++++++++--------------
migration/migration.c | 3 +-
monitor/qmp-cmds.c | 7 +-
qemu-img.c | 17 +-
tests/unit/test-bdrv-drain.c | 80 +++--
tests/unit/test-block-iothread.c | 8 +-
tests/unit/test-blockjob-txn.c | 24 +-
tests/unit/test-blockjob.c | 136 ++++----
tests/unit/test-coroutine.c | 2 +-
util/qemu-coroutine-lock.c | 14 +-
util/qemu-coroutine.c | 2 +-
44 files changed, 1237 insertions(+), 787 deletions(-)