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 <v.sementsov-og@mail.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>, Greg Kurz <groug@kaod.org>, Christian Schoenebeck <qemu_oss@crudebyte.com>, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>
block/blkdebug.c | 14 +++++++-------
block/blkverify.c | 2 +-
block/block-backend.c | 26 +++++++++++++-------------
block/copy-before-write.c | 8 ++++----
block/curl.c | 2 +-
block/file-posix.c | 2 +-
block/io.c | 24 ++++++++++++------------
block/iscsi.c | 2 +-
block/nbd.c | 10 +++++-----
block/nfs.c | 2 +-
block/nvme.c | 5 +++--
block/parallels.c | 5 +++--
block/qcow2-cluster.c | 18 +++++++++---------
block/qcow2-refcount.c | 6 +++---
block/qcow2.c | 4 ++--
block/qcow2.h | 18 +++++++++---------
block/qed.c | 4 ++--
block/quorum.c | 35 ++++++++++++++++++-----------------
block/raw-format.c | 2 +-
block/throttle.c | 2 +-
block/vmdk.c | 20 ++++++++++----------
hw/9pfs/9p.h | 9 ++++++---
include/block/nbd.h | 2 +-
include/qemu/coroutine.h | 2 +-
include/qemu/job.h | 2 +-
job.c | 2 +-
migration/migration.c | 3 ++-
tests/unit/test-coroutine.c | 2 +-
util/qemu-coroutine-lock.c | 14 +++++++-------
util/qemu-coroutine.c | 2 +-
30 files changed, 128 insertions(+), 121 deletions(-)