docs/devel/multiple-iothreads.txt | 4 +- block/qcow2.h | 4 + hw/block/nvme.h | 2 + include/block/block.h | 21 ++--- include/block/block_int.h | 1 + include/block/nvme.h | 2 + include/block/raw-aio.h | 3 - include/hw/block/block.h | 7 +- include/hw/qdev-properties.h | 3 + include/hw/scsi/scsi.h | 1 + include/sysemu/block-backend.h | 5 +- tests/libqtest.h | 11 +++ block.c | 79 ++++++++++++----- block/backup.c | 3 +- block/block-backend.c | 47 ++++++---- block/commit.c | 13 +-- block/crypto.c | 3 +- block/io.c | 28 +++--- block/linux-aio.c | 72 +++------------ block/mirror.c | 4 +- block/parallels.c | 3 +- block/qcow.c | 3 +- block/qcow2-refcount.c | 39 ++++++++- block/qcow2.c | 17 +++- block/qed.c | 3 +- block/sheepdog.c | 3 +- block/vdi.c | 3 +- block/vhdx.c | 3 +- block/vmdk.c | 3 +- block/vpc.c | 3 +- blockdev.c | 61 +++++++------ blockjob.c | 12 ++- hmp.c | 3 +- hw/block/dataplane/virtio-blk.c | 12 ++- hw/block/dataplane/xen-block.c | 6 +- hw/block/fdc.c | 2 +- hw/block/nvme.c | 106 +++++++++++++++++++++- hw/block/xen-block.c | 2 +- hw/core/qdev-properties-system.c | 41 ++++++++- hw/ide/qdev.c | 2 +- hw/scsi/scsi-disk.c | 24 +++-- hw/scsi/virtio-scsi.c | 25 +++--- migration/block.c | 3 +- nbd/server.c | 6 +- qemu-img.c | 6 +- tests/libqtest.c | 19 ++++ tests/test-bdrv-drain.c | 50 ++++++----- tests/test-bdrv-graph-mod.c | 5 +- tests/test-block-backend.c | 6 +- tests/test-block-iothread.c | 104 ++++++++++++++++++---- tests/test-blockjob.c | 2 +- tests/test-throttle.c | 6 +- tests/virtio-scsi-test.c | 63 ++++++++++++++ block/trace-events | 3 + hw/block/trace-events | 2 + tests/perf/block/qcow2/convert-blockstatus | 71 +++++++++++++++ tests/qemu-iotests/051 | 24 +++++ tests/qemu-iotests/051.out | 3 + tests/qemu-iotests/051.pc.out | 27 ++++++ tests/qemu-iotests/102 | 2 +- tests/qemu-iotests/102.out | 3 +- tests/qemu-iotests/141.out | 2 +- tests/qemu-iotests/144.out | 2 +- tests/qemu-iotests/240 | 21 +++++ tests/qemu-iotests/240.out | 15 +++- tests/qemu-iotests/250 | 78 +++++++++++++++++ tests/qemu-iotests/250.out | 16 ++++ tests/qemu-iotests/255 | 135 +++++++++++++++++++++++++++++ tests/qemu-iotests/255.out | 40 +++++++++ tests/qemu-iotests/check | 1 - tests/qemu-iotests/group | 2 + tests/qemu-iotests/iotests.py | 10 ++- 72 files changed, 1144 insertions(+), 272 deletions(-) create mode 100755 tests/perf/block/qcow2/convert-blockstatus create mode 100755 tests/qemu-iotests/250 create mode 100644 tests/qemu-iotests/250.out create mode 100755 tests/qemu-iotests/255 create mode 100644 tests/qemu-iotests/255.out