The following changes since commit 5d3217340adcb6c4f0e4af5d2b865331eb2ff63d:
disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers (2016-07-19
16:40:39 +0100)
are available in the git repository at:
git://github.com/XanClic/qemu.git tags/pull-block-2016-07-20
for you to fetch changes up to bafea5b7c26dd14895f7be64685a12645a75f4cf:
block: export LUKS specific data to qemu-img info (2016-07-20 00:34:03 +0200)
----------------------------------------------------------------
Block patches for master
----------------------------------------------------------------
Cao jin (1):
AioContext: correct comments
Daniel P. Berrange (2):
crypto: add support for querying parameters for block encryption
block: export LUKS specific data to qemu-img info
Vladimir Sementsov-Ogievskiy (1):
qcow2: do not allocate extra memory
block/crypto.c | 49 ++++++++++++++++++++++++++++++++
block/qcow.c | 2 +-
block/qcow2.c | 2 +-
crypto/block-luks.c | 67 ++++++++++++++++++++++++++++++++++++++++++++
crypto/block.c | 17 +++++++++++
crypto/blockpriv.h | 4 +++
include/block/aio.h | 2 +-
include/crypto/block.h | 16 +++++++++++
qapi/block-core.json | 6 +++-
qapi/crypto.json | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++
10 files changed, 237 insertions(+), 4 deletions(-)
--
2.9.0
