Add a new option "address" to the NBD block driver which accepts a
SocketAddress.
"path", "host" and "port" are still supported as legacy options and are
mapped to their corresponding SocketAddress representation.
Signed-off-by: Max Reitz <mre...@redhat.com>
---
block/nbd.c | 93 +++++++++++++++++++++++++++----------------
tests/qemu-iotests/051.out | 4 +-
tests/qemu-iotests/051.pc.out | 4 +-
3 files changed, 62 insertions(+), 39 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 86907bc..213ba70 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -31,6 +31,8 @@
#include "qemu/uri.h"
#include "block/block_int.h"
#include "qemu/module.h"
+#include "qapi-visit.h"
+#include "qapi/qmp-input-visitor.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qjson.h"
#include "qapi/qmp/qint.h"
@@ -127,7 +129,9 @@ static bool nbd_has_filename_options_conflict(QDict
*options, Error **errp)
if (!strcmp(e->key, "host")
|| !strcmp(e->key, "port")
|| !strcmp(e->key, "path")
- || !strcmp(e->key, "export"))
+ || !strcmp(e->key, "export")
+ || !strcmp(e->key, "address")
+ || !strncmp(e->key, "address.", 8))
{
error_setg(errp, "Option '%s' cannot be used with a file name",
e->key);
@@ -201,44 +205,64 @@ out:
g_free(file);
}
+static bool nbd_process_legacy_socket_options(QDict *options, Error **errp)
+{
+ if (qdict_haskey(options, "path") && qdict_haskey(options, "host")) {
+ error_setg(errp, "path and host may not be used at the same time");
+ return false;
+ } else if (qdict_haskey(options, "path")) {
+ if (qdict_haskey(options, "port")) {
+ error_setg(errp, "port may not be used without host");
+ return false;
+ }
+
+ qdict_put(options, "address.type", qstring_from_str("unix"));
+ qdict_change_key(options, "path", "address.data.path");
+ } else if (qdict_haskey(options, "host")) {
+ qdict_put(options, "address.type", qstring_from_str("inet"));
+ qdict_change_key(options, "host", "address.data.host");
+ if (!qdict_change_key(options, "port", "address.data.port")) {
+ qdict_put(options, "address.data.port",
+ qstring_from_str(stringify(NBD_DEFAULT_PORT)));
+ }
+ }
+
+ return true;
+}
+
static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options, char
**export,
Error **errp)
{
- SocketAddress *saddr;
+ SocketAddress *saddr = NULL;
+ QDict *addr = NULL;
+ QmpInputVisitor *iv;
+ Error *local_err = NULL;
- if (qdict_haskey(options, "path") == qdict_haskey(options, "host")) {
- if (qdict_haskey(options, "path")) {
- error_setg(errp, "path and host may not be used at the same time");
- } else {
- error_setg(errp, "one of path and host must be specified");
- }
- return NULL;
+ if (!nbd_process_legacy_socket_options(options, errp)) {
+ goto fail;
}
- if (qdict_haskey(options, "port") && !qdict_haskey(options, "host")) {
- error_setg(errp, "port may not be used without host");
- return NULL;
+
+ qdict_extract_subqdict(options, &addr, "address.");
+ if (!qdict_unflatten(addr, errp)) {
+ goto fail;
}
- saddr = g_new0(SocketAddress, 1);
+ if (!qdict_size(addr)) {
+ error_setg(errp, "NBD server address missing");
+ goto fail;
+ }
- if (qdict_haskey(options, "path")) {
- saddr->type = SOCKET_ADDRESS_KIND_UNIX;
- saddr->u.q_unix = g_new0(UnixSocketAddress, 1);
- saddr->u.q_unix->path = g_strdup(qdict_get_str(options, "path"));
- qdict_del(options, "path");
- } else {
- saddr->type = SOCKET_ADDRESS_KIND_INET;
- saddr->u.inet = g_new0(InetSocketAddress, 1);
- saddr->u.inet->host = g_strdup(qdict_get_str(options, "host"));
- if (!qdict_get_try_str(options, "port")) {
- saddr->u.inet->port = g_strdup_printf("%d", NBD_DEFAULT_PORT);
- } else {
- saddr->u.inet->port = g_strdup(qdict_get_str(options, "port"));
- }
- qdict_del(options, "host");
- qdict_del(options, "port");
+ iv = qmp_input_visitor_new(QOBJECT(addr));
+ visit_type_SocketAddress(qmp_input_get_visitor(iv), NULL, &saddr,
+ &local_err);
+ qmp_input_visitor_cleanup(iv);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ goto fail;
}
+ /* TODO: Detect superfluous (unused) options under in addr */
+
s->client.is_unix = saddr->type == SOCKET_ADDRESS_KIND_UNIX;
*export = g_strdup(qdict_get_try_str(options, "export"));
@@ -246,7 +270,12 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDict
*options, char **export,
qdict_del(options, "export");
}
+ QDECREF(addr);
return saddr;
+
+fail:
+ QDECREF(addr);
+ return NULL;
}
NbdClientSession *nbd_get_client_session(BlockDriverState *bs)
@@ -425,9 +454,6 @@ static void nbd_refresh_filename(BlockDriverState *bs,
QDict *options)
const char *tlscreds = qdict_get_try_str(options, "tls-creds");
if (qdict_get_try_str(options, "address.type")) {
- /* This path will only be possible as of a future patch;
- * TODO: Remove this note once it is */
-
const char *type = qdict_get_str(options, "address.type");
if (!strcmp(type, "unix")) {
@@ -471,9 +497,6 @@ static void nbd_refresh_filename(BlockDriverState *bs,
QDict *options)
}
if (qdict_get_try_str(options, "address.type")) {
- /* This path will only be possible as of a future patch;
- * TODO: Remove this note once it is */
-
const QDictEntry *e;
for (e = qdict_first(options); e; e = qdict_next(options, e)) {
if (!strncmp(e->key, "address.", 8)) {
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index 5166bea..82c1694 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -222,7 +222,7 @@ Testing: -drive driver=file
QEMU_PROG: -drive driver=file: The 'file' block driver requires a file name
Testing: -drive driver=nbd
-QEMU_PROG: -drive driver=nbd: one of path and host must be specified
+QEMU_PROG: -drive driver=nbd: NBD server address missing
Testing: -drive driver=raw
QEMU_PROG: -drive driver=raw: Can't use 'raw' as a block driver for the
protocol level
@@ -231,7 +231,7 @@ Testing: -drive file.driver=file
QEMU_PROG: -drive file.driver=file: The 'file' block driver requires a file
name
Testing: -drive file.driver=nbd
-QEMU_PROG: -drive file.driver=nbd: one of path and host must be specified
+QEMU_PROG: -drive file.driver=nbd: NBD server address missing
Testing: -drive file.driver=raw
QEMU_PROG: -drive file.driver=raw: Can't use 'raw' as a block driver for the
protocol level
diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
index d0bbfcb..45137b7 100644
--- a/tests/qemu-iotests/051.pc.out
+++ b/tests/qemu-iotests/051.pc.out
@@ -316,7 +316,7 @@ Testing: -drive driver=file
QEMU_PROG: -drive driver=file: The 'file' block driver requires a file name
Testing: -drive driver=nbd
-QEMU_PROG: -drive driver=nbd: one of path and host must be specified
+QEMU_PROG: -drive driver=nbd: NBD server address missing
Testing: -drive driver=raw
QEMU_PROG: -drive driver=raw: Can't use 'raw' as a block driver for the
protocol level
@@ -325,7 +325,7 @@ Testing: -drive file.driver=file
QEMU_PROG: -drive file.driver=file: The 'file' block driver requires a file
name
Testing: -drive file.driver=nbd
-QEMU_PROG: -drive file.driver=nbd: one of path and host must be specified
+QEMU_PROG: -drive file.driver=nbd: NBD server address missing
Testing: -drive file.driver=raw
QEMU_PROG: -drive file.driver=raw: Can't use 'raw' as a block driver for the
protocol level
--
2.7.1
