mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/nfs: fix QMP to match debug option

Browse Source 
The QMP definition of BlockdevOptionsNfs:
{ 'struct': 'BlockdevOptionsNfs',
  'data': { 'server': 'NFSServer',
            'path': 'str',
            '*user': 'int',
            '*group': 'int',
            '*tcp-syn-count': 'int',
            '*readahead-size': 'int',
            '*page-cache-size': 'int',
            '*debug-level': 'int' } }

To make this consistent with other block protocols like gluster, lets
change s/debug-level/debug/

Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
Prasanna Kumar Kalever 2016-11-02 22:20:37 +05:30 committed by Jeff Cody
parent 1a417e46ae
commit 7103d9165b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/nfs.c
View File

@ -134,7 +134,7 @@ static int nfs_parse_uri(const char *filename, QDict *options, Error **errp)
qdict_put(options, "page-cache-size", qdict_put(options, "page-cache-size",
qstring_from_str(qp->p[i].value)); qstring_from_str(qp->p[i].value));
} else if (!strcmp(qp->p[i].name, "debug")) { } else if (!strcmp(qp->p[i].name, "debug")) {
qdict_put(options, "debug-level", qdict_put(options, "debug",
qstring_from_str(qp->p[i].value)); qstring_from_str(qp->p[i].value));
} else { } else {
error_setg(errp, "Unknown NFS parameter name: %s", error_setg(errp, "Unknown NFS parameter name: %s",
@ -165,7 +165,7 @@ static bool nfs_has_filename_options_conflict(QDict *options, Error **errp)
!strcmp(qe->key, "tcp-syn-count") || !strcmp(qe->key, "tcp-syn-count") ||
!strcmp(qe->key, "readahead-size") || !strcmp(qe->key, "readahead-size") ||
!strcmp(qe->key, "page-cache-size") || !strcmp(qe->key, "page-cache-size") ||
!strcmp(qe->key, "debug-level") || !strcmp(qe->key, "debug") ||
strstart(qe->key, "server.", NULL)) strstart(qe->key, "server.", NULL))
{ {
error_setg(errp, "Option %s cannot be used with a filename", error_setg(errp, "Option %s cannot be used with a filename",

4
qapi/block-core.json
View File

@ -2292,7 +2292,7 @@
# @page-cache-size: #optional set the pagecache size in bytes (defaults # @page-cache-size: #optional set the pagecache size in bytes (defaults
# to libnfs default) # 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) # to libnfs default)
# #
# Since 2.8 # Since 2.8
@ -2305,7 +2305,7 @@
'*tcp-syn-count': 'int', '*tcp-syn-count': 'int',
'*readahead-size': 'int', '*readahead-size': 'int',
'*page-cache-size': 'int', '*page-cache-size': 'int',
'*debug-level': 'int' } } '*debug': 'int' } }
## ##
# @BlockdevOptionsCurl # @BlockdevOptionsCurl