Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Ari Sundholm <ari@tuxera.com>, Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>, Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, Stefan Weil <sw@weilnetz.de>, Fam Zheng <fam@euphon.net>, Ronnie Sahlberg <ronniesahlberg@gmail.com>, Peter Lieven <pl@kamp.de>, Eric Blake <eblake@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Alberto Garcia <berto@igalia.com>, Ilya Dryomov <idryomov@gmail.com>, Wen Congyang <wencongyang2@huawei.com>, Xie Changlong <xiechanglong.d@gmail.com>, "Richard W.M. Jones" <rjones@redhat.com>, Jeff Cody <codyprime@gmail.com>, Markus Armbruster <armbru@redhat.com>, Cleber Rosa <crosa@redhat.com>
qapi/block-core.json | 123 +++++++-
include/block/block-common.h | 11 +-
include/block/block-io.h | 41 ++-
include/block/block_int-common.h | 26 +-
include/block/block_int-io.h | 5 +-
include/block/nbd.h | 1 +
include/block/qapi.h | 14 +-
include/qemu/coroutine.h | 43 +++
include/sysemu/block-backend-io.h | 31 +-
block.c | 88 +++---
block/blkdebug.c | 11 +-
block/blkio.c | 15 +-
block/blklogwrites.c | 6 +-
block/blkreplay.c | 6 +-
block/blkverify.c | 6 +-
block/block-backend.c | 38 +--
block/commit.c | 4 +-
block/copy-on-read.c | 18 +-
block/crypto.c | 14 +-
block/curl.c | 10 +-
block/file-posix.c | 137 +++++----
block/file-win32.c | 18 +-
block/filter-compress.c | 20 +-
block/gluster.c | 23 +-
block/io.c | 76 ++---
block/iscsi.c | 17 +-
block/mirror.c | 6 +-
block/monitor/block-hmp-cmds.c | 2 +-
block/nbd.c | 8 +-
block/nfs.c | 4 +-
block/null.c | 13 +-
block/nvme.c | 14 +-
block/preallocate.c | 16 +-
block/qapi.c | 317 ++++++++++++++++-----
block/qcow.c | 5 +-
block/qcow2-bitmap.c | 5 +-
block/qcow2-refcount.c | 2 +-
block/qcow2.c | 17 +-
block/qed.c | 11 +-
block/quorum.c | 8 +-
block/raw-format.c | 25 +-
block/rbd.c | 9 +-
block/replication.c | 6 +-
block/ssh.c | 4 +-
block/throttle.c | 6 +-
block/vdi.c | 7 +-
block/vhdx.c | 5 +-
block/vmdk.c | 22 +-
block/vpc.c | 5 +-
blockdev.c | 8 +-
hw/block/block.c | 36 ++-
hw/scsi/scsi-disk.c | 5 +
qemu-img.c | 100 +++++--
qemu-io-cmds.c | 62 +---
tests/unit/test-block-iothread.c | 3 +
scripts/block-coroutine-wrapper.py | 20 +-
tests/qemu-iotests/iotests.py | 18 +-
block/meson.build | 1 +
tests/qemu-iotests/065 | 2 +-
tests/qemu-iotests/106 | 4 +-
tests/qemu-iotests/214 | 6 +-
tests/qemu-iotests/262 | 3 +-
tests/qemu-iotests/302.out | 5 +
tests/qemu-iotests/308 | 4 +-
tests/qemu-iotests/312 | 1 +
tests/qemu-iotests/common.filter | 22 +-
tests/qemu-iotests/common.rc | 22 +-
tests/qemu-iotests/tests/qemu-img-close-errors | 95 ++++++
tests/qemu-iotests/tests/qemu-img-close-errors.out | 23 ++
69 files changed, 1207 insertions(+), 552 deletions(-)
create mode 100755 tests/qemu-iotests/tests/qemu-img-close-errors
create mode 100644 tests/qemu-iotests/tests/qemu-img-close-errors.out