Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>, John Snow <jsnow@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, Eric Blake <eblake@redhat.com>, "Denis V. Lunev" <den@openvz.org>, Alberto Garcia <berto@igalia.com>, Stefan Weil <sw@weilnetz.de>, Jeff Cody <codyprime@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Thomas Huth <thuth@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Leonardo Bras <leobras@redhat.com>
meson_options.txt | 8 ++
configure | 1 +
block/coroutines.h | 5 +-
block/qcow2.h | 4 +-
include/block/aio-wait.h | 2 +-
include/block/block-global-state.h | 19 +++-
include/block/block-io.h | 23 +++--
include/block/block_int-common.h | 37 +++----
include/block/block_int-global-state.h | 4 +-
include/block/graph-lock.h | 20 ++--
include/block/qapi.h | 7 +-
include/sysemu/block-backend-global-state.h | 5 +-
block.c | 25 ++++-
block/amend.c | 8 +-
block/blkverify.c | 5 +-
block/block-backend.c | 10 +-
block/crypto.c | 8 +-
block/graph-lock.c | 3 +
block/io.c | 12 +--
block/mirror.c | 18 +++-
block/nbd.c | 50 +++++----
block/parallels.c | 6 +-
block/qapi.c | 6 +-
block/qcow.c | 6 +-
block/qcow2-refcount.c | 2 +-
block/qcow2.c | 48 ++++-----
block/qed.c | 24 ++---
block/quorum.c | 4 +-
block/raw-format.c | 2 +-
block/vdi.c | 6 +-
block/vhdx.c | 15 +--
block/vmdk.c | 20 ++--
block/vpc.c | 6 +-
blockdev.c | 25 +++--
hw/block/dataplane/virtio-blk.c | 3 +-
hw/scsi/virtio-scsi-dataplane.c | 2 -
migration/migration.c | 24 +++--
qemu-img.c | 2 +
tests/unit/test-bdrv-drain.c | 112 ++++++++++++++-------
util/aio-wait.c | 2 +-
block/meson.build | 18 +++-
meson.build | 5 +
scripts/meson-buildoptions.sh | 13 +++
tests/qemu-iotests/tests/iothreads-resize | 71 +++++++++++++
tests/qemu-iotests/tests/iothreads-resize.out | 11 ++
tests/qemu-iotests/tests/nbd-reconnect-on-open | 3 +-
tests/qemu-iotests/tests/nbd-reconnect-on-open.out | 4 +-
47 files changed, 474 insertions(+), 240 deletions(-)
create mode 100755 tests/qemu-iotests/tests/iothreads-resize
create mode 100644 tests/qemu-iotests/tests/iothreads-resize.out