Skip to content
  • Peter Maydell's avatar
    Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · e7a1d6c5
    Peter Maydell authored
    
    
    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: default avatarPeter Maydell <peter.maydell@linaro.org>
    e7a1d6c5