The following changes since commit 4cb618abc1818586c08011ff0a84a015787b1672:
Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150612' into staging
(2015-06-12 12:49: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 67251a311371c4d22e803f151f47fe817175b6c3:
block: Fix reopen flag inheritance (2015-06-12 17:04:59 +0200)
----------------------------------------------------------------
Block layer core and image format patches
----------------------------------------------------------------
Fam Zheng (3):
qemu-iotests: Fix 128 if sudo required
vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status
vmdk: Use vmdk_find_index_in_cluster everywhere
John Snow (3):
iotests: remove assertIsNotNone call
block: record new size in bdrv_dirty_bitmap_truncate
block: Change bitmap truncate conditional to assertion
Kevin Wolf (14):
raw-posix: Fix .bdrv_co_get_block_status() for unaligned image size
qdict: Add qdict_array_entries()
qdict: Add qdict_{set,copy}_default()
check-qdict: Test cases for new functions
quorum: Use bdrv_open_image()
vmdk: Use bdrv_open_image()
block: Use macro for cache option names
block: Use QemuOpts in bdrv_open_common()
block: Move flag inheritance to bdrv_open_inherit()
block: Drain requests before swapping nodes in bdrv_swap()
queue.h: Add QLIST_FIX_HEAD_PTR()
block: Add list of children to BlockDriverState
block: Add BlockDriverState.inherits_from
block: Fix reopen flag inheritance
Max Reitz (5):
qcow2: Set MIN_L2_CACHE_SIZE to 2
iotests: qcow2 COW with minimal L2 cache size
qcow2: Add DEFAULT_L2_CACHE_CLUSTERS
block: driver should override flags in bdrv_open()
iotests: Add tests for overriding BDRV_O_PROTOCOL
block.c | 237 +++++++++++++++++++++++++++++++++++++--------
block/blkdebug.c | 2 +-
block/blkverify.c | 4 +-
block/qcow2.c | 11 ++-
block/qcow2.h | 5 +-
block/quorum.c | 51 +++-------
block/raw-posix.c | 5 +-
block/vmdk.c | 84 +++++++---------
blockdev.c | 24 ++---
include/block/block.h | 12 ++-
include/block/block_int.h | 19 ++++
include/qapi/qmp/qdict.h | 4 +
include/qemu/queue.h | 6 ++
qobject/qdict.c | 111 ++++++++++++++++++++-
tests/check-qdict.c | 67 +++++++++++++
tests/qemu-iotests/051 | 1 -
tests/qemu-iotests/051.out | 3 -
tests/qemu-iotests/103 | 10 ++
tests/qemu-iotests/103.out | 5 +
tests/qemu-iotests/119 | 60 ++++++++++++
tests/qemu-iotests/119.out | 11 +++
tests/qemu-iotests/120 | 65 +++++++++++++
tests/qemu-iotests/120.out | 15 +++
tests/qemu-iotests/124 | 2 +-
tests/qemu-iotests/128 | 4 +-
tests/qemu-iotests/group | 2 +
26 files changed, 660 insertions(+), 160 deletions(-)
create mode 100755 tests/qemu-iotests/119
create mode 100644 tests/qemu-iotests/119.out
create mode 100755 tests/qemu-iotests/120
create mode 100644 tests/qemu-iotests/120.out
