The following changes since commit 8b6db32a4ec47d1171ccfa21d557096b99f4eef0:
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into
staging (2015-05-22 13:25:40 +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 4120201d2fcfc24404fe6eb6b761b66bc35bca16:
MAINTAINERS: Split "Block QAPI, monitor, command line" off core (2015-05-22
17:08:09 +0200)
----------------------------------------------------------------
Block layer core and image format patches
----------------------------------------------------------------
Alberto Garcia (7):
qcow2: use one single memory block for the L2/refcount cache tables
qcow2: simplify qcow2_cache_put() and qcow2_cache_entry_mark_dirty()
qcow2: use an LRU algorithm to replace entries from the L2 cache
qcow2: remove qcow2_cache_find_entry_to_replace()
qcow2: use a hash to look for entries in the L2 cache
qcow2: make qcow2_cache_put() a void function
qcow2: style fixes in qcow2-cache.c
Christoph Hellwig (1):
nvme: support NVME_VOLATILE_WRITE_CACHE feature
Daniel P. Berrange (5):
qcow2/qcow: protect against uninitialized encryption key
util: move read_password method out of qemu-img into osdep/oslib
util: allow \n to terminate password input
qemu-io: prompt for encryption keys when required
tests: add test case for encrypted qcow2 read/write
Eric Blake (1):
qemu-io: Use getopt() correctly
Fam Zheng (5):
vmdk: Fix next_cluster_sector for compressed write
vmdk: Fix overflow if l1_size is 0x20000000
block: Detect multiplication overflow in bdrv_getlength
qemu-iotests: qemu-img info on afl VMDK image with a huge capacity
qemu-iotests: Make debugging python tests easier
Kevin Wolf (2):
qcow2: Flush pending discards before allocating cluster
MAINTAINERS: Add header files to Block Layer Core section
Markus Armbruster (1):
MAINTAINERS: Split "Block QAPI, monitor, command line" off core
MAINTAINERS | 9 ++
block.c | 1 +
block/qcow.c | 10 +-
block/qcow2-cache.c | 171 +++++++++++--------------
block/qcow2-cluster.c | 65 +++-------
block/qcow2-refcount.c | 42 +++---
block/qcow2.c | 18 ++-
block/qcow2.h | 5 +-
block/vmdk.c | 17 ++-
hw/block/nvme.c | 3 +
include/qemu/osdep.h | 2 +
qemu-img.c | 93 +-------------
qemu-io-cmds.c | 16 +--
qemu-io.c | 23 +++-
tests/qemu-iotests/059 | 5 +
tests/qemu-iotests/059.out | 3 +
tests/qemu-iotests/134 | 69 ++++++++++
tests/qemu-iotests/134.out | 46 +++++++
tests/qemu-iotests/check | 12 +-
tests/qemu-iotests/common | 6 +
tests/qemu-iotests/group | 1 +
tests/qemu-iotests/iotests.py | 14 +-
tests/qemu-iotests/sample_images/afl9.vmdk.bz2 | Bin 0 -> 178 bytes
util/oslib-posix.c | 67 ++++++++++
util/oslib-win32.c | 24 ++++
25 files changed, 429 insertions(+), 293 deletions(-)
create mode 100755 tests/qemu-iotests/134
create mode 100644 tests/qemu-iotests/134.out
create mode 100644 tests/qemu-iotests/sample_images/afl9.vmdk.bz2
