Failed in applying to current master (
apply log)
include/block/aio.h | 4 +-
include/hw/virtio/virtio-blk.h | 2 +-
include/hw/virtio/virtio.h | 5 +-
util/aio-posix.h | 1 +
block/curl.c | 11 ++--
block/export/fuse.c | 4 +-
block/io_uring.c | 19 ++++---
block/iscsi.c | 4 +-
block/linux-aio.c | 16 +++---
block/nfs.c | 6 +--
block/nvme.c | 51 ++++++++++++-------
block/ssh.c | 4 +-
block/win32-aio.c | 4 +-
hw/block/dataplane/virtio-blk.c | 16 +-----
hw/block/virtio-blk.c | 14 ++----
hw/scsi/virtio-scsi-dataplane.c | 60 +++-------------------
hw/scsi/virtio-scsi.c | 2 +-
hw/virtio/virtio.c | 73 +++++++++------------------
hw/xen/xen-bus.c | 6 +--
io/channel-command.c | 6 ++-
io/channel-file.c | 3 +-
io/channel-socket.c | 3 +-
migration/rdma.c | 8 +--
tests/unit/test-aio.c | 4 +-
tests/unit/test-fdmon-epoll.c | 4 +-
util/aio-posix.c | 89 +++++++++++++++++++++++++--------
util/aio-win32.c | 4 +-
util/async.c | 10 +++-
util/main-loop.c | 4 +-
util/qemu-coroutine-io.c | 5 +-
util/vhost-user-server.c | 11 ++--
31 files changed, 221 insertions(+), 232 deletions(-)