[libvirt] [PATCH v2 2/8] util: storage: Split out parsing of TCP network host from JSON pseudoprotocol

[Peter Krempa]

Few backing protocols support only TCP. Split out the function which
will correspond to parsing qemu's InetSocketAddressBase.
---

Notes:
    v2:
    - resolved merge conflict after adding a patch
    - changed ordering of setting of the transport type

 src/util/virstoragefile.c | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 7f2a50fd1..9af0cdbcd 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2795,12 +2795,34 @@ virStorageSourceParseBackingJSONUri(virStorageSourcePtr src,


 static int
+virStorageSourceParseBackingJSONInetSocketAddress(virStorageNetHostDefPtr host,
+                                                  virJSONValuePtr json)
+{
+    const char *hostname = virJSONValueObjectGetString(json, "host");
+    const char *port = virJSONValueObjectGetString(json, "port");
+
+    if (!hostname) {
+        virReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("missing hostname for tcp backing server in "
+                         "JSON backing volume definition"));
+        return -1;
+    }
+
+    host->transport = VIR_STORAGE_NET_HOST_TRANS_TCP;
+
+    if (VIR_STRDUP(host->name, hostname) < 0 ||
+        VIR_STRDUP(host->port, port) < 0)
+        return -1;
+
+    return 0;
+}
+
+
+static int
 virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDefPtr host,
                                               virJSONValuePtr json)
 {
     const char *type = virJSONValueObjectGetString(json, "type");
-    const char *hostname = virJSONValueObjectGetString(json, "host");
-    const char *port = virJSONValueObjectGetString(json, "port");
     const char *socket = virJSONValueObjectGetString(json, "socket");

     if (!type) {
@@ -2811,18 +2833,8 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDefPtr host,
     }

     if (STREQ(type, "tcp") || STREQ(type, "inet")) {
-        host->transport = VIR_STORAGE_NET_HOST_TRANS_TCP;
+        return virStorageSourceParseBackingJSONInetSocketAddress(host, json);

-        if (!hostname) {
-            virReportError(VIR_ERR_INVALID_ARG, "%s",
-                           _("missing hostname for tcp backing server in "
-                             "JSON backing volume definition"));
-            return -1;
-        }
-
-        if (VIR_STRDUP(host->name, hostname) < 0 ||
-            VIR_STRDUP(host->port, port) < 0)
-            return -1;
     } else if (STREQ(type, "unix")) {
         host->transport = VIR_STORAGE_NET_HOST_TRANS_UNIX;

-- 
2.12.2