The following changes since commit 42bb626f7ebc9197d2943b897a99e127315275ab:
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into
staging (2016-04-12 09:34:52 +0100)
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git tags/for-upstream
for you to fetch changes up to 5158ac58306b3e8644fc020730f651fe74aa6674:
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-12'
into queue-block (2016-04-12 18:09:16 +0200)
----------------------------------------------------------------
Block layer patches for 2.6
----------------------------------------------------------------
Daniel P. Berrange (2):
qemu-img: fix formatting of error message
block: initialize qcrypto API at startup
Kevin Wolf (1):
Merge remote-tracking branch
'mreitz/tags/pull-block-for-kevin-2016-04-12' into queue-block
Max Reitz (3):
iotests: Make 150 use qemu-img map instead of du
qcow2: Prevent backing file names longer than 1023
MAINTAINERS: Block layer core, qcow2 and blkdebug
Paolo Bonzini (1):
vpc: fix return value check for blk_pwrite
Pavel Butsykin (1):
iotests: fix the broken 026.nocache output
Sascha Silbe (6):
qemu-iotests: check: don't place files with predictable names in /tmp
qemu-iotests: fix 051 on non-PC architectures
qemu-iotests: iotests.VM: remove qtest socket on error
qemu-iotests: 148: properly skip test if quorum support is missing
qemu-iotests: 068: don't require KVM
qemu-iotests: iotests.py: get rid of __all__
MAINTAINERS | 3 +
block/qcow2.c | 4 ++
block/vpc.c | 2 +-
qemu-img.c | 8 ++-
qemu-io.c | 6 ++
qemu-nbd.c | 7 ++
tests/qemu-iotests/026.out.nocache | 142 ++++++++++++++++++++++++++++++++-----
tests/qemu-iotests/051.out | 10 +--
tests/qemu-iotests/068 | 2 +-
tests/qemu-iotests/148 | 4 +-
tests/qemu-iotests/150 | 41 ++---------
tests/qemu-iotests/150.out | 13 ++--
tests/qemu-iotests/check | 21 +++---
tests/qemu-iotests/iotests.py | 22 ++++--
14 files changed, 196 insertions(+), 89 deletions(-)
