aboutsummaryrefslogtreecommitdiff
path: root/qapi
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-07-27 16:31:01 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-07-27 16:31:01 +0100
commitdf5c50a208296c8303e591296f4e834a3b3fcb3d (patch)
treea5a14eda272efc162227678a5f8ab1843193c6df /qapi
parentc1fdfe9fcaf4e47ec3def98c5a7c52d2cae6c511 (diff)
parent0965a41e998ab820b5d660c8abfc8c819c97bc1b (diff)
downloadqemu-df5c50a208296c8303e591296f4e834a3b3fcb3d.zip
qemu-df5c50a208296c8303e591296f4e834a3b3fcb3d.tar.gz
qemu-df5c50a208296c8303e591296f4e834a3b3fcb3d.tar.bz2
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 26 Jul 2016 21:51:38 BST # gpg: using RSA key 0xBDBE7B27C0DE3057 # gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>" # gpg: aka "Jeffrey Cody <jeff@codyprime.org>" # gpg: aka "Jeffrey Cody <codyprime@gmail.com>" # Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057 * remotes/cody/tags/block-pull-request: mirror: double performance of the bulk stage if the disc is full block/gluster: fix doc in the qapi schema and member name Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
-rw-r--r--qapi/block-core.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json
index d4bab5d..2bbc027 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1692,9 +1692,9 @@
# Drivers that are supported in block device operations.
#
# @host_device, @host_cdrom: Since 2.1
+# @gluster: Since 2.7
#
# Since: 2.0
-# @gluster: Since 2.7
##
{ 'enum': 'BlockdevDriver',
'data': [ 'archipelago', 'blkdebug', 'blkverify', 'bochs', 'cloop',
@@ -2138,7 +2138,7 @@
#
# @path: absolute path to image file in gluster volume
#
-# @server: gluster server description
+# @server: gluster servers description
#
# @debug-level: #optional libgfapi log level (default '4' which is Error)
#
@@ -2148,7 +2148,7 @@
'data': { 'volume': 'str',
'path': 'str',
'server': ['GlusterServer'],
- '*debug_level': 'int' } }
+ '*debug-level': 'int' } }
##
# @BlockdevOptions