Commit f67409a5 authored by Peter Lieven's avatar Peter Lieven Committed by Max Reitz
Browse files

block/nfs: fix naming of runtime opts 



commit 94d6a7a7 accidentally left the naming of runtime opts and QAPI
scheme inconsistent. As one consequence passing of parameters in the
URI is broken. Sync the naming of the runtime opts to the QAPI
scheme.

Please note that this is technically backwards incompatible with the 2.8
release, but the 2.8 release is the only version that had the wrong naming.
Furthermore release 2.8 suffered from a NULL pointer dereference during
URI parsing.

Fixes: 94d6a7a7
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarPeter Lieven <pl@kamp.de>
Message-id: 1485942829-10756-3-git-send-email-pl@kamp.de
[mreitz: Fixed commit message]
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 8d20abe8

block/nfs.c

+23 −23
Original line number Diff line number Diff line
@@ -359,27 +359,27 @@ static QemuOptsList runtime_opts = { 
            .help = "Path of the image on the host",

        },

        {

            .name = "uid",

            .name = "user",

            .type = QEMU_OPT_NUMBER,

            .help = "UID value to use when talking to the server",

        },

        {

            .name = "gid",

            .name = "group",

            .type = QEMU_OPT_NUMBER,

            .help = "GID value to use when talking to the server",

        },

        {

            .name = "tcp-syncnt",

            .name = "tcp-syn-count",

            .type = QEMU_OPT_NUMBER,

            .help = "Number of SYNs to send during the session establish",

        },

        {

            .name = "readahead",

            .name = "readahead-size",

            .type = QEMU_OPT_NUMBER,

            .help = "Set the readahead size in bytes",

        },

        {

            .name = "pagecache",

            .name = "page-cache-size",

            .type = QEMU_OPT_NUMBER,

            .help = "Set the pagecache size in bytes",

        },
@@ -508,29 +508,29 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options, 
        goto fail;

    }



    if (qemu_opt_get(opts, "uid")) {

        client->uid = qemu_opt_get_number(opts, "uid", 0);

    if (qemu_opt_get(opts, "user")) {

        client->uid = qemu_opt_get_number(opts, "user", 0);

        nfs_set_uid(client->context, client->uid);

    }



    if (qemu_opt_get(opts, "gid")) {

        client->gid = qemu_opt_get_number(opts, "gid", 0);

    if (qemu_opt_get(opts, "group")) {

        client->gid = qemu_opt_get_number(opts, "group", 0);

        nfs_set_gid(client->context, client->gid);

    }



    if (qemu_opt_get(opts, "tcp-syncnt")) {

        client->tcp_syncnt = qemu_opt_get_number(opts, "tcp-syncnt", 0);

    if (qemu_opt_get(opts, "tcp-syn-count")) {

        client->tcp_syncnt = qemu_opt_get_number(opts, "tcp-syn-count", 0);

        nfs_set_tcp_syncnt(client->context, client->tcp_syncnt);

    }



#ifdef LIBNFS_FEATURE_READAHEAD

    if (qemu_opt_get(opts, "readahead")) {

    if (qemu_opt_get(opts, "readahead-size")) {

        if (open_flags & BDRV_O_NOCACHE) {

            error_setg(errp, "Cannot enable NFS readahead "

                             "if cache.direct = on");

            goto fail;

        }

        client->readahead = qemu_opt_get_number(opts, "readahead", 0);

        client->readahead = qemu_opt_get_number(opts, "readahead-size", 0);

        if (client->readahead > QEMU_NFS_MAX_READAHEAD_SIZE) {

            error_report("NFS Warning: Truncating NFS readahead "

                         "size to %d", QEMU_NFS_MAX_READAHEAD_SIZE);
@@ -545,13 +545,13 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options, 
#endif



#ifdef LIBNFS_FEATURE_PAGECACHE

    if (qemu_opt_get(opts, "pagecache")) {

    if (qemu_opt_get(opts, "page-cache-size")) {

        if (open_flags & BDRV_O_NOCACHE) {

            error_setg(errp, "Cannot enable NFS pagecache "

                             "if cache.direct = on");

            goto fail;

        }

        client->pagecache = qemu_opt_get_number(opts, "pagecache", 0);

        client->pagecache = qemu_opt_get_number(opts, "page-cache-size", 0);

        if (client->pagecache > QEMU_NFS_MAX_PAGECACHE_SIZE) {

            error_report("NFS Warning: Truncating NFS pagecache "

                         "size to %d pages", QEMU_NFS_MAX_PAGECACHE_SIZE);
@@ -804,21 +804,21 @@ static void nfs_refresh_filename(BlockDriverState *bs, QDict *options) 
    qdict_put(opts, "path", qstring_from_str(client->path));



    if (client->uid) {

        qdict_put(opts, "uid", qint_from_int(client->uid));

        qdict_put(opts, "user", qint_from_int(client->uid));

    }

    if (client->gid) {

        qdict_put(opts, "gid", qint_from_int(client->gid));

        qdict_put(opts, "group", qint_from_int(client->gid));

    }

    if (client->tcp_syncnt) {

        qdict_put(opts, "tcp-syncnt",

        qdict_put(opts, "tcp-syn-cnt",

                  qint_from_int(client->tcp_syncnt));

    }

    if (client->readahead) {

        qdict_put(opts, "readahead",

        qdict_put(opts, "readahead-size",

                  qint_from_int(client->readahead));

    }

    if (client->pagecache) {

        qdict_put(opts, "pagecache",

        qdict_put(opts, "page-cache-size",

                  qint_from_int(client->pagecache));

    }

    if (client->debug) {