Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block patches

# gpg: Signature made Fri 21 Feb 2014 21:42:24 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream: (54 commits)
  iotests: Mixed quorum child device specifications
  quorum: Simplify quorum_open()
  quorum: Add unit test.
  quorum: Add quorum_open() and quorum_close().
  quorum: Implement recursive .bdrv_recurse_is_first_non_filter in quorum.
  quorum: Add quorum_co_flush().
  quorum: Add quorum_invalidate_cache().
  quorum: Add quorum_getlength().
  quorum: Add quorum mechanism.
  quorum: Add quorum_aio_readv.
  blkverify: Extract qemu_iovec_clone() and qemu_iovec_compare() from blkverify.
  quorum: Add quorum_aio_writev and its dependencies.
  quorum: Create BDRVQuorumState and BlkDriver and do init.
  quorum: Create quorum.c, add QuorumChildRequest and QuorumAIOCB.
  check-qdict: Test termination of qdict_array_split()
  check-qdict: Adjust test for qdict_array_split()
  qdict: Extract non-QDicts in qdict_array_split()
  qemu-config: Sections must consist of keys
  qemu-iotests: Check qemu-img command line parsing
  qemu-img: Allow -o help with incomplete argument list
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --cc block/Makefile.objs
Simple merge

diff --cc configure
index 00f90702bc6ced69ac411a8b6ad42f1564b81343,6143acbcbf0dc77aaf3dc219e620dd9d409f08e5..2735f9ae253c608b7e1c4a6db89ecb3301d386bc
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -4411,11 -4324,13 +4443,15 @@@ if test "$glusterfs_zerofill" = "yes" 
  fi
  
  if test "$libssh2" = "yes" ; then
 -  echo "CONFIG_LIBSSH2=y" >> $config_host_mak
 +  echo "CONFIG_LIBSSH2=m" >> $config_host_mak
 +  echo "LIBSSH2_CFLAGS=$libssh2_cflags" >> $config_host_mak
 +  echo "LIBSSH2_LIBS=$libssh2_libs" >> $config_host_mak
  fi
  
+ if test "$quorum" = "yes" ; then
+   echo "CONFIG_QUORUM=y" >> $config_host_mak
+ fi
+ 
  if test "$virtio_blk_data_plane" = "yes" ; then
    echo 'CONFIG_VIRTIO_BLK_DATA_PLANE=$(CONFIG_VIRTIO)' >> $config_host_mak
  fi

diff --cc hw/block/xen_disk.c
Simple merge

diff --cc include/qemu-common.h
Simple merge

diff --cc qemu-img.c
Simple merge

diff --cc qemu-io.c
Simple merge

diff --cc qemu-nbd.c
Simple merge