The following changes since commit 1a381811b495651ddfc2b50d7c8cfaaf375816b0:
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-s390-20140515' into staging (2014-05-15 18:56:08 +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 465bee1da82e43f18d10c43cc7566d0284ad13a9: block: optimize zero writes with bdrv_write_zeroes (2014-05-19 13:42:27 +0200) ---------------------------------------------------------------- Block patches ---------------------------------------------------------------- Fam Zheng (1): qemu-iotests: Fix blkdebug in VM drive in 030 Jeff Cody (2): block: vhdx - account for identical header sections block: add test for vhdx image created by Disk2VHD Kevin Wolf (6): block: Fix bdrv_is_allocated() for short backing files qcow1: Make padding in the header explicit qcow1: Check maximum cluster size qcow1: Validate L2 table size (CVE-2014-0222) qcow1: Validate image size (CVE-2014-0223) qcow1: Stricter backing file length check Markus Armbruster (1): qemu-iotests: Fix core dump suppression in test 039 Matthew Booth (4): curl: Fix build when curl_multi_socket_action isn't available curl: Remove broken parsing of options from url curl: Add sslverify option curl: Add usage documentation Max Reitz (4): qdict: Add qdict_join() check-qdict: Add test for qdict_join() block: Allow JSON filenames iotests: Add test for the JSON protocol Mike Day (1): Remove g_sequence_lookup from qemu-img help function Peter Lieven (3): util: add qemu_iovec_is_zero blockdev: add a function to parse enum ids from strings block: optimize zero writes with bdrv_write_zeroes block.c | 60 +++++++++- block/curl.c | 79 ++++++------- block/qapi.c | 1 + block/qcow.c | 44 +++++-- block/vhdx.c | 9 +- blockdev.c | 43 +++++++ hmp.c | 5 + include/block/block.h | 11 +- include/block/block_int.h | 1 + include/qapi/qmp/qdict.h | 3 + include/qemu-common.h | 1 + qapi-schema.json | 52 ++++++--- qemu-img.c | 7 +- qemu-options.hx | 74 ++++++++++++ qmp-commands.hx | 3 + qobject/qdict.c | 32 +++++ tests/check-qdict.c | 87 ++++++++++++++ tests/qemu-iotests/030 | 2 +- tests/qemu-iotests/039 | 20 ++-- tests/qemu-iotests/039.out | 3 + tests/qemu-iotests/067.out | 10 +- tests/qemu-iotests/070 | 7 ++ tests/qemu-iotests/070.out | 7 ++ tests/qemu-iotests/089 | 130 +++++++++++++++++++++ tests/qemu-iotests/089.out | 54 +++++++++ tests/qemu-iotests/092 | 98 ++++++++++++++++ tests/qemu-iotests/092.out | 38 ++++++ tests/qemu-iotests/common.filter | 1 + tests/qemu-iotests/group | 2 + .../sample_images/test-disk2vhd.vhdx.bz2 | Bin 0 -> 1424 bytes util/iov.c | 21 ++++ 31 files changed, 809 insertions(+), 96 deletions(-) create mode 100755 tests/qemu-iotests/089 create mode 100644 tests/qemu-iotests/089.out create mode 100755 tests/qemu-iotests/092 create mode 100644 tests/qemu-iotests/092.out create mode 100644 tests/qemu-iotests/sample_images/test-disk2vhd.vhdx.bz2