The following changes since commit 3e890c77cf038d8c2de66ed7996fe77a6f94787c:
Merge remote-tracking branch 'remotes/stefanha/tags/qtest-monitor-process-pull-request' into staging (2014-02-21 14:54:05 +0000) are available in the git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to 6141f3bd6904df7cf9519c6444a14a608b9874c4: iotests: Mixed quorum child device specifications (2014-02-21 22:40:19 +0100) ---------------------------------------------------------------- Block patches ---------------------------------------------------------------- BenoƮt Canet (12): quorum: Create quorum.c, add QuorumChildRequest and QuorumAIOCB. quorum: Create BDRVQuorumState and BlkDriver and do init. quorum: Add quorum_aio_writev and its dependencies. blkverify: Extract qemu_iovec_clone() and qemu_iovec_compare() from blkverify. quorum: Add quorum_aio_readv. quorum: Add quorum mechanism. quorum: Add quorum_getlength(). quorum: Add quorum_invalidate_cache(). quorum: Add quorum_co_flush(). quorum: Implement recursive .bdrv_recurse_is_first_non_filter in quorum. quorum: Add quorum_open() and quorum_close(). quorum: Add unit test. Kevin Wolf (8): qcow2: Set zero flag for discarded clusters block: Fix bdrv_is_first_non_filter() qemu-option: has_help_option() and is_valid_option_list() qemu-img create: Support multiple -o options qemu-img convert: Support multiple -o options qemu-img amend: Support multiple -o options qemu-img: Allow -o help with incomplete argument list qemu-iotests: Check qemu-img command line parsing Max Reitz (14): block: Change BDS parameter of bdrv_open() to ** block: Add reference parameter to bdrv_open() block: Make bdrv_file_open() static block: Reuse reference handling from bdrv_open() block: Remove bdrv_new() from bdrv_file_open() block: Handle bs->options in bdrv_open() only block: Reuse success path from bdrv_open() block: Remove bdrv_open_image()'s force_raw option qemu-config: Sections must consist of keys qdict: Extract non-QDicts in qdict_array_split() check-qdict: Adjust test for qdict_array_split() check-qdict: Test termination of qdict_array_split() quorum: Simplify quorum_open() iotests: Mixed quorum child device specifications Paolo Bonzini (20): nbd: produce a better error if neither host nor port is passed nbd: correctly propagate errors nbd: inline tcp_socket_incoming_spec into sole caller nbd: move socket wrappers to qemu-nbd iscsi: fix indentation iscsi: correctly propagate errors in iscsi_open gluster: default scheme to gluster:// and host to localhost. gluster: correctly propagate errors cow: correctly propagate errors curl: correctly propagate errors qcow: correctly propagate errors qed: correctly propagate errors vhdx: correctly propagate errors vvfat: correctly propagate errors vmdk: extract vmdk_read_desc vmdk: push vmdk_read_desc up to caller vmdk: do not try opening a file as both image and descriptor vmdk: correctly propagate errors block: do not abuse EMEDIUMTYPE vdi: say why an image is bad block.c | 232 ++++++------ block/Makefile.objs | 1 + block/blkdebug.c | 3 +- block/blkverify.c | 114 +----- block/bochs.c | 3 +- block/cow.c | 16 +- block/curl.c | 13 +- block/gluster.c | 28 +- block/iscsi.c | 142 ++++---- block/nbd.c | 43 ++- block/parallels.c | 3 +- block/qcow.c | 20 +- block/qcow2-cluster.c | 22 +- block/qcow2.c | 20 +- block/qed.c | 24 +- block/quorum.c | 870 +++++++++++++++++++++++++++++++++++++++++++++ block/sheepdog.c | 7 +- block/vdi.c | 29 +- block/vhdx.c | 25 +- block/vmdk.c | 142 +++++--- block/vpc.c | 3 +- block/vvfat.c | 15 +- blockdev.c | 22 +- configure | 36 ++ docs/qmp/qmp-events.txt | 36 ++ hw/block/xen_disk.c | 4 +- include/block/block.h | 13 +- include/block/nbd.h | 6 - include/monitor/monitor.h | 2 + include/qemu-common.h | 2 + include/qemu/option.h | 2 + monitor.c | 5 + nbd.c | 66 ---- qapi-schema.json | 21 +- qemu-img.c | 145 +++++--- qemu-io.c | 8 +- qemu-nbd.c | 54 ++- qobject/qdict.c | 60 +++- tests/check-qdict.c | 75 +++- tests/qemu-iotests/046 | 18 +- tests/qemu-iotests/051.out | 4 +- tests/qemu-iotests/059.out | 6 +- tests/qemu-iotests/081 | 146 ++++++++ tests/qemu-iotests/081.out | 49 +++ tests/qemu-iotests/082 | 208 +++++++++++ tests/qemu-iotests/082.out | 529 +++++++++++++++++++++++++++ tests/qemu-iotests/group | 2 + util/iov.c | 106 ++++++ util/qemu-config.c | 6 + util/qemu-option.c | 49 +++ 50 files changed, 2820 insertions(+), 635 deletions(-) create mode 100644 block/quorum.c create mode 100755 tests/qemu-iotests/081 create mode 100644 tests/qemu-iotests/081.out create mode 100755 tests/qemu-iotests/082 create mode 100644 tests/qemu-iotests/082.out