From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 29 May 2018 11:40:16 +0000 (+0200)
Subject: qemu: domain: Separate setup of TLS for VXHS disks from qemuDomainPrepareDiskSourceTLS
X-Git-Tag: v4.5.0-rc1~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2396774b6af4a87c97285f86baf519d5a87d4432;p=thirdparty%2Flibvirt.git

qemu: domain: Separate setup of TLS for VXHS disks from qemuDomainPrepareDiskSourceTLS

Split out the code into a separate function so that all steps for a
storage protocol are contained and the original function is easily
extendable.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 080cfeec96..308eea65a9 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9928,6 +9928,32 @@ qemuDomainPrepareChardevSource(virDomainDefPtr def,
 }
 
 
+static int
+qemuProcessPrepareStorageSourceTLSVxhs(virStorageSourcePtr src,
+                                       virQEMUDriverConfigPtr cfg)
+{
+    /* VxHS uses only client certificates and thus has no need for
+     * the server-key.pem nor a secret that could be used to decrypt
+     * the it, so no need to add a secinfo for a secret UUID. */
+    if (src->haveTLS == VIR_TRISTATE_BOOL_ABSENT) {
+        if (cfg->vxhsTLS)
+            src->haveTLS = VIR_TRISTATE_BOOL_YES;
+        else
+            src->haveTLS = VIR_TRISTATE_BOOL_NO;
+        src->tlsFromConfig = true;
+    }
+
+    if (src->haveTLS == VIR_TRISTATE_BOOL_YES) {
+        if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0)
+            return -1;
+
+        src->tlsVerify = true;
+    }
+
+    return 0;
+}
+
+
 /* qemuProcessPrepareDiskSourceTLS:
  * @source: pointer to host interface data for disk device
  * @cfg: driver configuration
@@ -9945,29 +9971,10 @@ qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src,
     virStorageSourcePtr next;
 
     for (next = src; virStorageSourceIsBacking(next); next = next->backingStore) {
-        /* VxHS uses only client certificates and thus has no need for
-         * the server-key.pem nor a secret that could be used to decrypt
-         * the it, so no need to add a secinfo for a secret UUID. */
         if (next->type == VIR_STORAGE_TYPE_NETWORK &&
-            next->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS) {
-
-            if (next->haveTLS == VIR_TRISTATE_BOOL_ABSENT) {
-                if (cfg->vxhsTLS)
-                    next->haveTLS = VIR_TRISTATE_BOOL_YES;
-                else
-                    next->haveTLS = VIR_TRISTATE_BOOL_NO;
-                next->tlsFromConfig = true;
-            }
-
-            if (next->haveTLS == VIR_TRISTATE_BOOL_YES) {
-                /* Grab the vxhsTLSx509certdir and set the verify/listen values.
-                 * NB: tlsAlias filled in during qemuDomainGetTLSObjects. */
-                if (VIR_STRDUP(next->tlsCertdir, cfg->vxhsTLSx509certdir) < 0)
-                    return -1;
-
-                next->tlsVerify = true;
-            }
-        }
+            next->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS &&
+            qemuProcessPrepareStorageSourceTLSVxhs(next, cfg) < 0)
+            return -1;
     }
 
     return 0;