Commit 7103d916 authored by Prasanna Kumar Kalever's avatar Prasanna Kumar Kalever Committed by Jeff Cody
Browse files

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: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarPrasanna Kumar Kalever <prasanna.kalever@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent 1a417e46

block/nfs.c

+2 −2
Original line number Diff line number Diff line
@@ -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",

qapi/block-core.json

+2 −2
Original line number Diff line number Diff line
@@ -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