[Xen-changelog] [qemu-xen master] Merge remote-tracking branch 'jtc/tags/block-pull-request' into staging

[patchbot@xxxxxxx]

commit 8a04c80f9fd5d9c0ef8b512fe2f51457ba255ec3
Merge: 5d3074f0dbe18b52ff4fc571c78dd6228525cfb0 
76b5550f709b975a7b04fb4c887f300b7bb731c2
Author:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
AuthorDate: Tue Dec 6 09:55:57 2016 +0000
Commit:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
CommitDate: Tue Dec 6 09:55:57 2016 +0000

    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@xxxxxxxxxx>"
    # gpg:                 aka "Jeffrey Cody <jeff@xxxxxxxxxxxxx>"
    # gpg:                 aka "Jeffrey Cody <codyprime@xxxxxxxxx>"
    # 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@xxxxxxxxxx
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>

 block/gluster.c      | 40 +++++++++++++++++------------------
 block/nfs.c          |  4 ++--
 qapi/block-core.json |  8 +++----
 qemu-doc.texi        | 59 +++++++++++++++++++++++++++++++++++++++-------------
 qemu-options.hx      | 25 ++++++++++++++++++++--
 5 files changed, 94 insertions(+), 42 deletions(-)

diff --cc qapi/block-core.json
index ec1da2a,f22ed2a..a298e76
--- 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.
  #
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog