[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 11/16] block/nbd: Use SocketAddress options
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v2 11/16] block/nbd: Use SocketAddress options |
Date: |
Tue, 1 Mar 2016 00:19:28 +0100 |
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 <address@hidden>
---
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
- [Qemu-block] [PATCH v2 00/16] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 01/16] qdict: Add qdict_change_key(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 02/16] qdict: Add qdict_unflatten(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 03/16] check-qdict: Add a test for qdict_unflatten(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 04/16] block/nbd: Drop trailing "." in error messages, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 05/16] block/nbd: Reject port parameter without host, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 06/16] block/nbd: Default port in nbd_refresh_filename(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 07/16] block/nbd: Use qdict_put(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 08/16] block/nbd: Add nbd_has_filename_options_conflict(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 09/16] block/nbd: "address" in nbd_refresh_filename(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 11/16] block/nbd: Use SocketAddress options,
Max Reitz <=
- [Qemu-block] [PATCH v2 10/16] block/nbd: Accept SocketAddress, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 12/16] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 15/16] socket_scm_helper: Accept fd directly, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 14/16] iotests.py: Allow concurrent qemu instances, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 16/16] iotests: Add test for NBD's blockdev-add interface, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 13/16] iotests.py: Add qemu_nbd function, Max Reitz, 2016/02/29
- Re: [Qemu-block] [PATCH v2 00/16] qapi: Allow blockdev-add for NBD, Eric Blake, 2016/02/29