crypto/blockpriv.h | 13 +++-- include/block/aio.h | 6 +++ include/block/raw-aio.h | 1 + include/crypto/block.h | 2 - block/copy-before-write.c | 2 +- block/crypto.c | 1 - block/file-posix.c | 17 ++++-- block/linux-aio.c | 21 +++++++- block/qcow.c | 2 +- block/qcow2.c | 5 +- crypto/block-luks.c | 4 +- crypto/block-qcow.c | 8 ++- crypto/block.c | 114 ++++++++++++++++++++++++----------------- qapi/qmp-dispatch.c | 7 ++- qemu-io-cmds.c | 48 ++++++++++++++++- tests/unit/test-crypto-block.c | 4 -- 16 files changed, 176 insertions(+), 79 deletions(-)