openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block/nbd: Use SocketAddress options 

Drop the use of legacy options in favor of the SocketAddress
representation, even for internal use (i.e. for storing the result of
the filename parsing).

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2016-10-25 15:11:35 +02:00 committed by Kevin Wolf
parent 491d6c7c4e
commit f84d431b86
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
block/nbd.c
View File

@ -94,9 +94,13 @@ static int nbd_parse_uri(const char *filename, QDict *options)
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
qdict_put(options, "path", qstring_from_str(qp->p[0].value)); qdict_put(options, "server.type", qstring_from_str("unix"));
qdict_put(options, "server.data.path",
qstring_from_str(qp->p[0].value));
} else { } else {
QString *host; QString *host;
char *port_str;
/* nbd[+tcp]://host[:port]/export */ /* nbd[+tcp]://host[:port]/export */
if (!uri->server) { if (!uri->server) {
ret = -EINVAL; ret = -EINVAL;
@ -111,12 +115,12 @@ static int nbd_parse_uri(const char *filename, QDict *options)
host = qstring_from_str(uri->server); host = qstring_from_str(uri->server);
} }
qdict_put(options, "host", host); qdict_put(options, "server.type", qstring_from_str("inet"));
if (uri->port) { qdict_put(options, "server.data.host", host);
char* port_str = g_strdup_printf("%d", uri->port);
qdict_put(options, "port", qstring_from_str(port_str)); port_str = g_strdup_printf("%d", uri->port ?: NBD_DEFAULT_PORT);
g_free(port_str); qdict_put(options, "server.data.port", qstring_from_str(port_str));
} g_free(port_str);
} }
out: out:
@ -192,7 +196,8 @@ static void nbd_parse_filename(const char *filename, QDict *options,
/* are we a UNIX or TCP socket? */ /* are we a UNIX or TCP socket? */
if (strstart(host_spec, "unix:", &unixpath)) { if (strstart(host_spec, "unix:", &unixpath)) {
qdict_put(options, "path", qstring_from_str(unixpath)); qdict_put(options, "server.type", qstring_from_str("unix"));
qdict_put(options, "server.data.path", qstring_from_str(unixpath));
} else { } else {
InetSocketAddress *addr = NULL; InetSocketAddress *addr = NULL;
@ -201,8 +206,9 @@ static void nbd_parse_filename(const char *filename, QDict *options,
goto out; goto out;
} }
qdict_put(options, "host", qstring_from_str(addr->host)); qdict_put(options, "server.type", qstring_from_str("inet"));
qdict_put(options, "port", qstring_from_str(addr->port)); qdict_put(options, "server.data.host", qstring_from_str(addr->host));
qdict_put(options, "server.data.port", qstring_from_str(addr->port));
qapi_free_InetSocketAddress(addr); qapi_free_InetSocketAddress(addr);
} }