include/qemu/job.h | 3 ++ block/qcow2.c | 4 +- hw/scsi/scsi-disk.c | 39 +++++++++----- job.c | 6 +++ qemu-img.c | 6 ++- tests/unit/test-bdrv-drain.c | 32 +++++++----- tests/qemu-iotests/tests/qcow2-encryption | 75 +++++++++++++++++++++++++++ tests/qemu-iotests/tests/qcow2-encryption.out | 32 ++++++++++++ 8 files changed, 167 insertions(+), 30 deletions(-) create mode 100755 tests/qemu-iotests/tests/qcow2-encryption create mode 100644 tests/qemu-iotests/tests/qcow2-encryption.out