The following changes since commit 2b750d9d261bda7f75b39dfc1e1e5f22502929d5:
Merge remote-tracking branch 'remotes/aurel/tags/pull-sh4-next-20150913' into staging (2015-09-14 10:46:38 +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 2ac01520be8717f3492b10a083c3e0e22cb52cda: qcow2: Make qcow2_alloc_bytes() more explicit (2015-09-14 16:51:37 +0200) ---------------------------------------------------------------- Block layer patches (v2) ---------------------------------------------------------------- Kevin Wolf (14): qcow2: Rename BDRVQcowState to BDRVQcow2State block: Allow specifying driver-specific options to reopen qemu-io: Remove duplicate 'open' error message qemu-io: Add command 'reopen' qcow2: Improve error message qcow2: Factor out qcow2_update_options() qcow2: Move qcow2_update_options() call up qcow2: Move rest of option handling to qcow2_update_options() qcow2: Leave s unchanged on qcow2_update_options() failure qcow2: Fix memory leak in qcow2_update_options() error path qcow2: Make qcow2_update_options() suitable for transactions qcow2: Support updating driver-specific options in reopen qemu-iotests: Reopen qcow2 with lazy-refcounts change qemu-iotests: More qcow2 reopen tests Max Reitz (8): block: Always pass NULL as drv for bdrv_open() block: Drop drv parameter from bdrv_open() block: Drop drv parameter from bdrv_open_inherit() block: Drop drv parameter from bdrv_fill_options() block: Drop bdrv_find_whitelisted_format() qcow2: Make size_to_clusters() return uint64_t iotests: Add test for checking large image files qcow2: Make qcow2_alloc_bytes() more explicit Radoslav Gerganov (1): vmdk: Fix next_cluster_sector for compressed write block.c | 150 +++++++------- block/block-backend.c | 2 +- block/commit.c | 4 +- block/parallels.c | 2 +- block/qcow.c | 2 +- block/qcow2-cache.c | 14 +- block/qcow2-cluster.c | 76 +++---- block/qcow2-refcount.c | 76 ++++--- block/qcow2-snapshot.c | 20 +- block/qcow2.c | 486 +++++++++++++++++++++++++++++---------------- block/qcow2.h | 26 +-- block/qed.c | 2 +- block/sheepdog.c | 5 +- block/vdi.c | 2 +- block/vhdx.c | 2 +- block/vmdk.c | 15 +- block/vpc.c | 2 +- block/vvfat.c | 8 +- blockdev.c | 72 +++---- include/block/block.h | 9 +- qemu-io-cmds.c | 90 +++++++++ qemu-io.c | 1 - tests/qemu-iotests/039 | 27 +++ tests/qemu-iotests/039.out | 18 ++ tests/qemu-iotests/137 | 145 ++++++++++++++ tests/qemu-iotests/137.out | 42 ++++ tests/qemu-iotests/138 | 73 +++++++ tests/qemu-iotests/138.out | 9 + tests/qemu-iotests/group | 2 + 29 files changed, 973 insertions(+), 409 deletions(-) create mode 100755 tests/qemu-iotests/137 create mode 100644 tests/qemu-iotests/137.out create mode 100755 tests/qemu-iotests/138 create mode 100644 tests/qemu-iotests/138.out