The following changes since commit b597aa037dbd98014c8dec3d69a5e2240f432533:
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-09-04'
into staging (2015-09-04 17:37:50 +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 c804b5791d51608c0e12e4cc2b40b3d763ce796c:
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-09-04'
into queue-block (2015-09-04 21:43:55 +0200)
----------------------------------------------------------------
Block layer patches
----------------------------------------------------------------
Alberto Garcia (4):
qcow2: mark the memory as no longer needed after qcow2_cache_empty()
qcow2: add option to clean unused cache entries after some time
docs: document how to configure the qcow2 L2/refcount caches
qcow2: reorder fields in Qcow2CachedTable to reduce padding
Bo Tu (5):
qemu-iotests: qemu machine type support
qemu-iotests: disable default qemu devices for cross-platform
compatibility
qemu-iotests: s390x: fix test 041 and 055
qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts
qemu-iotests: s390x: fix test 130
Kevin Wolf (1):
Merge remote-tracking branch
'mreitz/tags/pull-block-for-kevin-2015-09-04' into queue-block
Max Reitz (6):
block/raw-posix: Use raw_normalize_devicepath()
qemu-img: Fix crash in amend invocation
iotests: More options for VM.add_drive()
iotests: Respect -nodefaults in tests 41 and 55
iotests: Do not suppress segfaults in bash tests
iotests: Warn if python subprocess is killed
Wen Congyang (1):
quorum: validate vote threshold against num_children even if read-pattern
is fifo
block/qcow2-cache.c | 63 +++++++++-
block/qcow2.c | 64 ++++++++++
block/qcow2.h | 4 +
block/quorum.c | 12 +-
block/raw-posix.c | 22 +++-
docs/qcow2-cache.txt | 164 ++++++++++++++++++++++++
qapi/block-core.json | 7 +-
qemu-img.c | 3 +-
tests/qemu-iotests/039 | 19 +--
tests/qemu-iotests/039.out | 6 +-
tests/qemu-iotests/041 | 18 ++-
tests/qemu-iotests/049.out | 10 +-
tests/qemu-iotests/055 | 19 ++-
tests/qemu-iotests/061 | 6 +-
tests/qemu-iotests/061.out | 2 +
tests/qemu-iotests/067 | 8 +-
tests/qemu-iotests/067.out | 266 +--------------------------------------
tests/qemu-iotests/071.out | 4 -
tests/qemu-iotests/081.out | 2 -
tests/qemu-iotests/087.out | 12 --
tests/qemu-iotests/130 | 8 +-
tests/qemu-iotests/130.out | 4 +-
tests/qemu-iotests/check | 13 +-
tests/qemu-iotests/common | 1 +
tests/qemu-iotests/common.config | 38 +++++-
tests/qemu-iotests/common.qemu | 2 +-
tests/qemu-iotests/common.rc | 12 +-
tests/qemu-iotests/iotests.py | 52 ++++++--
util/qemu-option.c | 5 +
29 files changed, 487 insertions(+), 359 deletions(-)
create mode 100644 docs/qcow2-cache.txt
