falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block/nfs: fix naming of runtime opts 

commit 94d6a7a 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: 94d6a7a76e
Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Lieven <pl@kamp.de>
Message-id: 1485942829-10756-3-git-send-email-pl@kamp.de
[mreitz: Fixed commit message]
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Peter Lieven 2017-02-01 10:53:49 +01:00 committed by Max Reitz
parent 8d20abe87a
commit f67409a5bb
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
block/nfs.c
View File

@ -359,27 +359,27 @@ static QemuOptsList runtime_opts = {
.help = "Path of the image on the host", .help = "Path of the image on the host",
}, },
{ {
.name = "uid", .name = "user",
.type = QEMU_OPT_NUMBER, .type = QEMU_OPT_NUMBER,
.help = "UID value to use when talking to the server", .help = "UID value to use when talking to the server",
}, },
{ {
.name = "gid", .name = "group",
.type = QEMU_OPT_NUMBER, .type = QEMU_OPT_NUMBER,
.help = "GID value to use when talking to the server", .help = "GID value to use when talking to the server",
}, },
{ {
.name = "tcp-syncnt", .name = "tcp-syn-count",
.type = QEMU_OPT_NUMBER, .type = QEMU_OPT_NUMBER,
.help = "Number of SYNs to send during the session establish", .help = "Number of SYNs to send during the session establish",
}, },
{ {
.name = "readahead", .name = "readahead-size",
.type = QEMU_OPT_NUMBER, .type = QEMU_OPT_NUMBER,
.help = "Set the readahead size in bytes", .help = "Set the readahead size in bytes",
}, },
{ {
.name = "pagecache", .name = "page-cache-size",
.type = QEMU_OPT_NUMBER, .type = QEMU_OPT_NUMBER,
.help = "Set the pagecache size in bytes", .help = "Set the pagecache size in bytes",
}, },
@ -508,29 +508,29 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options,
goto fail; goto fail;
} }
if (qemu_opt_get(opts, "uid")) { if (qemu_opt_get(opts, "user")) {
client->uid = qemu_opt_get_number(opts, "uid", 0); client->uid = qemu_opt_get_number(opts, "user", 0);
nfs_set_uid(client->context, client->uid); nfs_set_uid(client->context, client->uid);
} }
if (qemu_opt_get(opts, "gid")) { if (qemu_opt_get(opts, "group")) {
client->gid = qemu_opt_get_number(opts, "gid", 0); client->gid = qemu_opt_get_number(opts, "group", 0);
nfs_set_gid(client->context, client->gid); nfs_set_gid(client->context, client->gid);
} }
if (qemu_opt_get(opts, "tcp-syncnt")) { if (qemu_opt_get(opts, "tcp-syn-count")) {
client->tcp_syncnt = qemu_opt_get_number(opts, "tcp-syncnt", 0); client->tcp_syncnt = qemu_opt_get_number(opts, "tcp-syn-count", 0);
nfs_set_tcp_syncnt(client->context, client->tcp_syncnt); nfs_set_tcp_syncnt(client->context, client->tcp_syncnt);
} }
#ifdef LIBNFS_FEATURE_READAHEAD #ifdef LIBNFS_FEATURE_READAHEAD
if (qemu_opt_get(opts, "readahead")) { if (qemu_opt_get(opts, "readahead-size")) {
if (open_flags & BDRV_O_NOCACHE) { if (open_flags & BDRV_O_NOCACHE) {
error_setg(errp, "Cannot enable NFS readahead " error_setg(errp, "Cannot enable NFS readahead "
"if cache.direct = on"); "if cache.direct = on");
goto fail; 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) { if (client->readahead > QEMU_NFS_MAX_READAHEAD_SIZE) {
error_report("NFS Warning: Truncating NFS readahead " error_report("NFS Warning: Truncating NFS readahead "
"size to %d", QEMU_NFS_MAX_READAHEAD_SIZE); "size to %d", QEMU_NFS_MAX_READAHEAD_SIZE);
@ -545,13 +545,13 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options,
#endif #endif
#ifdef LIBNFS_FEATURE_PAGECACHE #ifdef LIBNFS_FEATURE_PAGECACHE
if (qemu_opt_get(opts, "pagecache")) { if (qemu_opt_get(opts, "page-cache-size")) {
if (open_flags & BDRV_O_NOCACHE) { if (open_flags & BDRV_O_NOCACHE) {
error_setg(errp, "Cannot enable NFS pagecache " error_setg(errp, "Cannot enable NFS pagecache "
"if cache.direct = on"); "if cache.direct = on");
goto fail; 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) { if (client->pagecache > QEMU_NFS_MAX_PAGECACHE_SIZE) {
error_report("NFS Warning: Truncating NFS pagecache " error_report("NFS Warning: Truncating NFS pagecache "
"size to %d pages", QEMU_NFS_MAX_PAGECACHE_SIZE); "size to %d pages", QEMU_NFS_MAX_PAGECACHE_SIZE);
@ -804,22 +804,22 @@ static void nfs_refresh_filename(BlockDriverState *bs, QDict *options)
qdict_put(opts, "path", qstring_from_str(client->path)); qdict_put(opts, "path", qstring_from_str(client->path));
if (client->uid) { if (client->uid) {
qdict_put(opts, "uid", qint_from_int(client->uid)); qdict_put(opts, "user", qint_from_int(client->uid));
} }
if (client->gid) { 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) { if (client->tcp_syncnt) {
qdict_put(opts, "tcp-syncnt", qdict_put(opts, "tcp-syn-cnt",
qint_from_int(client->tcp_syncnt)); qint_from_int(client->tcp_syncnt));
} }
if (client->readahead) { if (client->readahead) {
qdict_put(opts, "readahead", qdict_put(opts, "readahead-size",
qint_from_int(client->readahead)); qint_from_int(client->readahead));
} }
if (client->pagecache) { if (client->pagecache) {
qdict_put(opts, "pagecache", qdict_put(opts, "page-cache-size",
qint_from_int(client->pagecache)); qint_from_int(client->pagecache));
} }
if (client->debug) { if (client->debug) {
qdict_put(opts, "debug", qint_from_int(client->debug)); qdict_put(opts, "debug", qint_from_int(client->debug));