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 <[email protected]>"
# gpg:                 aka "Jeffrey Cody <[email protected]>"
# gpg:                 aka "Jeffrey Cody <[email protected]>"
# 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[email protected]
Signed-off-by: Stefan Hajnoczi <[email protected]>

diff --cc qapi/block-core.json
index ec1da2a29a7b7f6d434b7024204558244d3b40e5,f22ed2aa49ae565039db46ebf27190eccd985319..a298e7609a071c0f0a7694b09c5123e1ce61ccba
--- 1/qapi/block-core.json
--- 2/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.
  #