1:12 p.m.
Extract out the "guts" of building a server entry into it's own
separately callable/usable function in order to allow building
a server entry for a consumer with src->nhosts == 1.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
This patch would go after patch 5 and before patch 6 in the order
of things. All it does is extract out the "single" server syntax
into it's own function so that it can be used by code that supports
only 1 host. It's also usable by the multiple hosts support via the
array append call.
src/qemu/qemu_block.c | 106 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 70 insertions(+), 36 deletions(-)
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index d07269f4e..c97b787c5 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -380,6 +380,74 @@ qemuBlockGetNodeData(virJSONValuePtr data)
/**
+ * qemuBlockStorageSourceBuildJSONSocketAddress
+ * @host: the virStorageNetHostDefPtr definition to build
+ * @legacy: use 'tcp' instead of 'inet' for compatibility reasons
+ *
+ * Formats @hosts into a json object conforming to the 'SocketAddress' type
+ * in qemu.
+ *
+ * This function can be used when only 1 src->nhosts is expected in order
+ * to build a command without the array indices after "server.". That is
+ * to see "server.type", "server.host", and "server.port"
instead of
+ * "server.#.type", "server.#.host", and "server.#.port".
+ *
+ * Returns a virJSONValuePtr for a single server.
+ */
+static virJSONValuePtr
+qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDefPtr host,
+ bool legacy)
+{
+ virJSONValuePtr server = NULL;
+ virJSONValuePtr ret = NULL;
+ const char *transport;
+ char *port = NULL;
+
+ switch ((virStorageNetHostTransport) host->transport) {
+ case VIR_STORAGE_NET_HOST_TRANS_TCP:
+ if (legacy)
+ transport = "tcp";
+ else
+ transport = "inet";
+
+ if (virAsprintf(&port, "%u", host->port) < 0)
+ goto cleanup;
+
+ if (virJSONValueObjectCreate(&server,
+ "s:type", transport,
+ "s:host", host->name,
+ "s:port", port,
+ NULL) < 0)
+ goto cleanup;
+ break;
+
+ case VIR_STORAGE_NET_HOST_TRANS_UNIX:
+ if (virJSONValueObjectCreate(&server,
+ "s:type", "unix",
+ "s:socket", host->socket,
+ NULL) < 0)
+ goto cleanup;
+ break;
+
+ case VIR_STORAGE_NET_HOST_TRANS_RDMA:
+ case VIR_STORAGE_NET_HOST_TRANS_LAST:
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("transport protocol '%s' is not yet
supported"),
+ virStorageNetHostTransportTypeToString(host->transport));
+ goto cleanup;
+ }
+
+ VIR_STEAL_PTR(ret, server);
+
+ cleanup:
+ VIR_FREE(port);
+ virJSONValueFree(server);
+
+ return ret;
+}
+
+
+/**
* qemuBlockStorageSourceBuildHostsJSONSocketAddress:
* @src: disk storage source
* @legacy: use 'tcp' instead of 'inet' for compatibility reasons
@@ -395,8 +463,6 @@ qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSourcePtr
src,
virJSONValuePtr server = NULL;
virJSONValuePtr ret = NULL;
virStorageNetHostDefPtr host;
- const char *transport;
- char *port = NULL;
size_t i;
if (!(servers = virJSONValueNewArray()))
@@ -405,39 +471,8 @@ qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSourcePtr
src,
for (i = 0; i < src->nhosts; i++) {
host = src->hosts + i;
- switch ((virStorageNetHostTransport) host->transport) {
- case VIR_STORAGE_NET_HOST_TRANS_TCP:
- if (legacy)
- transport = "tcp";
- else
- transport = "inet";
-
- if (virAsprintf(&port, "%u", host->port) < 0)
- goto cleanup;
-
- if (virJSONValueObjectCreate(&server,
- "s:type", transport,
- "s:host", host->name,
- "s:port", port,
- NULL) < 0)
- goto cleanup;
- break;
-
- case VIR_STORAGE_NET_HOST_TRANS_UNIX:
- if (virJSONValueObjectCreate(&server,
- "s:type", "unix",
- "s:socket", host->socket,
- NULL) < 0)
- goto cleanup;
- break;
-
- case VIR_STORAGE_NET_HOST_TRANS_RDMA:
- case VIR_STORAGE_NET_HOST_TRANS_LAST:
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("transport protocol '%s' is not yet
supported"),
- virStorageNetHostTransportTypeToString(host->transport));
- goto cleanup;
- }
+ if (!(server = qemuBlockStorageSourceBuildJSONSocketAddress(host, legacy)))
+ goto cleanup;
if (virJSONValueArrayAppend(servers, server) < 0)
goto cleanup;
@@ -450,7 +485,6 @@ qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSourcePtr
src,
cleanup:
virJSONValueFree(servers);
virJSONValueFree(server);
- VIR_FREE(port);
return ret;
}
--
2.13.5