diff options
| author | Peter Maydell | 2014-02-25 11:50:11 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-02-25 11:50:11 +0100 |
| commit | e7a1d6c52a3ac6e76e5653c830b2545e0a4043d3 (patch) | |
| tree | c79235495674ca3dceded77db7224e54419f6f61 /qapi-schema.json | |
| parent | Merge remote-tracking branch 'remotes/sstabellini/xen-140220' into staging (diff) | |
| parent | iotests: Mixed quorum child device specifications (diff) | |
| download | qemu-e7a1d6c52a3ac6e76e5653c830b2545e0a4043d3.tar.gz qemu-e7a1d6c52a3ac6e76e5653c830b2545e0a4043d3.tar.xz qemu-e7a1d6c52a3ac6e76e5653c830b2545e0a4043d3.zip | |
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>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 473c096fa9..fcb2280053 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4432,6 +4432,24 @@ 'raw': 'BlockdevRef' } } ## +# @BlockdevOptionsQuorum +# +# Driver specific block device options for Quorum +# +# @blkverify: #optional true if the driver must print content mismatch +# +# @children: the children block device to use +# +# @vote_threshold: the vote limit under which a read will fail +# +# Since: 2.0 +## +{ 'type': 'BlockdevOptionsQuorum', + 'data': { '*blkverify': 'bool', + 'children': [ 'BlockdevRef' ], + 'vote-threshold': 'int' } } + +## # @BlockdevOptions # # Options for creating a block device. @@ -4470,7 +4488,8 @@ 'vdi': 'BlockdevOptionsGenericFormat', 'vhdx': 'BlockdevOptionsGenericFormat', 'vmdk': 'BlockdevOptionsGenericCOWFormat', - 'vpc': 'BlockdevOptionsGenericFormat' + 'vpc': 'BlockdevOptionsGenericFormat', + 'quorum': 'BlockdevOptionsQuorum' } } ## |