diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-12-06 09:55:57 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-12-06 09:55:57 +0000 |
| commit | 8a04c80f9fd5d9c0ef8b512fe2f51457ba255ec3 (patch) | |
| tree | cc144c5ead2a294bb92e12d525ed232ee64ba902 /qapi | |
| parent | 5d3074f0dbe18b52ff4fc571c78dd6228525cfb0 (diff) | |
| parent | 76b5550f709b975a7b04fb4c887f300b7bb731c2 (diff) | |
| download | qemu-8a04c80f9fd5d9c0ef8b512fe2f51457ba255ec3.tar.gz | |
Merge remote-tracking branch 'jtc/tags/block-pull-request' into staging
# gpg: Signature made Mon 05 Dec 2016 09:30:45 PM GMT
# 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
* jtc/tags/block-pull-request:
qemu-doc: update gluster protocol usage guide
block/nfs: fix QMP to match debug option
block/gluster: fix QMP to match debug option
Message-id: 1480973521-28945-1-git-send-email-jcody@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/block-core.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index ec1da2a29a..a298e7609a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2195,7 +2195,7 @@ # # @server: gluster servers description # -# @debug-level: #optional libgfapi log level (default '4' which is Error) +# @debug: #optional libgfapi log level (default '4' which is Error) # # @logfile: #optional libgfapi log file (default /dev/stderr) (Since 2.8) # @@ -2205,7 +2205,7 @@ 'data': { 'volume': 'str', 'path': 'str', 'server': ['GlusterServer'], - '*debug-level': 'int', + '*debug': 'int', '*logfile': 'str' } } ## @@ -2292,7 +2292,7 @@ # @page-cache-size: #optional set the pagecache size in bytes (defaults # to libnfs default) # -# @debug-level: #optional set the NFS debug level (max 2) (defaults +# @debug: #optional set the NFS debug level (max 2) (defaults # to libnfs default) # # Since: 2.8 @@ -2305,7 +2305,7 @@ '*tcp-syn-count': 'int', '*readahead-size': 'int', '*page-cache-size': 'int', - '*debug-level': 'int' } } + '*debug': 'int' } } ## # @BlockdevOptionsCurl: |