From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpLu4-0004tF-4Y for qemu-devel@nongnu.org; Wed, 28 Sep 2016 16:56:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpLu2-0006mw-7P for qemu-devel@nongnu.org; Wed, 28 Sep 2016 16:56:31 -0400 From: Max Reitz Date: Wed, 28 Sep 2016 22:55:57 +0200 Message-Id: <20160928205602.17275-8-mreitz@redhat.com> In-Reply-To: <20160928205602.17275-1-mreitz@redhat.com> References: <20160928205602.17275-1-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v4 07/12] block/nbd: Use SocketAddress options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Max Reitz , Kevin Wolf , Eric Blake , Paolo Bonzini , Markus Armbruster 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 --- block/nbd.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 449f94e..932249b 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -94,9 +94,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; @@ -111,12 +115,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: @@ -193,7 +197,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; @@ -202,8 +207,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); } -- 2.10.0