diff options
| author | Prasanna Kumar Kalever <prasanna.kalever@redhat.com> | 2016-11-02 22:20:37 +0530 |
|---|---|---|
| committer | Jeff Cody <jcody@redhat.com> | 2016-12-05 16:30:21 -0500 |
| commit | 7103d9165b78dd827e05d87f1edf1a5ec0847ebe (patch) | |
| tree | 142d7649dee0670eb33261b4f5c4c2c95f0c4cc1 | |
| parent | 1a417e46aedb7d762691fdd9aaab67465240b830 (diff) | |
block/nfs: fix QMP to match debug option
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>
| -rw-r--r-- | block/nfs.c | 4 | ||||
| -rw-r--r-- | qapi/block-core.json | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/block/nfs.c b/block/nfs.c index d08278323f..a490660027 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -134,7 +134,7 @@ static int nfs_parse_uri(const char *filename, QDict *options, Error **errp) qdict_put(options, "page-cache-size", qstring_from_str(qp->p[i].value)); } else if (!strcmp(qp->p[i].name, "debug")) { - qdict_put(options, "debug-level", + qdict_put(options, "debug", qstring_from_str(qp->p[i].value)); } else { 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, "readahead-size") || !strcmp(qe->key, "page-cache-size") || - !strcmp(qe->key, "debug-level") || + !strcmp(qe->key, "debug") || strstart(qe->key, "server.", NULL)) { error_setg(errp, "Option %s cannot be used with a filename", diff --git a/qapi/block-core.json b/qapi/block-core.json index 03b19f1c44..f22ed2aa49 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -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 |