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 <mre...@redhat.com> --- block/nbd.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 213ba70..471395a 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -88,9 +88,13 @@ static int nbd_parse_uri(const char *filename, QDict *options) ret = -EINVAL; goto out; } - qdict_put(options, "path", qstring_from_str(qp->p[0].value)); + qdict_put(options, "address.type", qstring_from_str("unix")); + qdict_put(options, "address.data.path", + qstring_from_str(qp->p[0].value)); } else { QString *host; + char *port_str; + /* nbd[+tcp]://host[:port]/export */ if (!uri->server) { ret = -EINVAL; @@ -105,12 +109,12 @@ static int nbd_parse_uri(const char *filename, QDict *options) host = qstring_from_str(uri->server); } - qdict_put(options, "host", host); - if (uri->port) { - char* port_str = g_strdup_printf("%d", uri->port); - qdict_put(options, "port", qstring_from_str(port_str)); - g_free(port_str); - } + qdict_put(options, "address.type", qstring_from_str("inet")); + qdict_put(options, "address.data.host", host); + + port_str = g_strdup_printf("%d", uri->port ?: NBD_DEFAULT_PORT); + qdict_put(options, "address.data.port", qstring_from_str(port_str)); + g_free(port_str); } out: @@ -187,7 +191,8 @@ static void nbd_parse_filename(const char *filename, QDict *options, /* are we a UNIX or TCP socket? */ if (strstart(host_spec, "unix:", &unixpath)) { - qdict_put(options, "path", qstring_from_str(unixpath)); + qdict_put(options, "address.type", qstring_from_str("unix")); + qdict_put(options, "address.data.path", qstring_from_str(unixpath)); } else { InetSocketAddress *addr = NULL; @@ -196,8 +201,9 @@ static void nbd_parse_filename(const char *filename, QDict *options, goto out; } - qdict_put(options, "host", qstring_from_str(addr->host)); - qdict_put(options, "port", qstring_from_str(addr->port)); + qdict_put(options, "address.type", qstring_from_str("inet")); + qdict_put(options, "address.data.host", qstring_from_str(addr->host)); + qdict_put(options, "address.data.port", qstring_from_str(addr->port)); qapi_free_InetSocketAddress(addr); } @@ -506,10 +512,12 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options) } } else { if (path) { - qdict_put(opts, "path", qstring_from_str(path)); + qdict_put(opts, "address.type", qstring_from_str("unix")); + qdict_put(opts, "address.data.path", qstring_from_str(path)); } else { - qdict_put(opts, "host", qstring_from_str(host)); - qdict_put(opts, "port", qstring_from_str(port)); + qdict_put(opts, "address.type", qstring_from_str("inet")); + qdict_put(opts, "address.data.host", qstring_from_str(host)); + qdict_put(opts, "address.data.port", qstring_from_str(port)); } } if (export) { -- 2.7.1