From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Tue, 6 Dec 2016 09:55:57 +0000 (+0000)
Subject: Merge remote-tracking branch 'jtc/tags/block-pull-request' into staging
X-Git-Tag: v2.8.0-rc3~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8a04c80f9fd5d9c0ef8b512fe2f51457ba255ec3;p=users%2Fdwmw2%2Fqemu.git
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>
---
8a04c80f9fd5d9c0ef8b512fe2f51457ba255ec3
diff --cc qapi/block-core.json
index ec1da2a29a,f22ed2aa49..a298e7609a
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@@ -2292,10 -2292,10 +2292,10 @@@
# @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
+# Since: 2.8
##
{ 'struct': 'BlockdevOptionsNfs',
'data': { 'server': 'NFSServer',
@@@ -2305,10 -2305,10 +2305,10 @@@
'*tcp-syn-count': 'int',
'*readahead-size': 'int',
'*page-cache-size': 'int',
- '*debug-level': 'int' } }
+ '*debug': 'int' } }
##
-# @BlockdevOptionsCurl
+# @BlockdevOptionsCurl:
#
# Driver specific block device options for the curl backend.
#