From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 29 May 2018 12:57:37 +0000 (+0200)
Subject: qemu: command: Always setup TLS environment if src->haveTLS is on
X-Git-Tag: v4.5.0-rc1~319
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cbc026b5d7c085cd1bb63d308cc951452ff4ff5;p=thirdparty%2Flibvirt.git

qemu: command: Always setup TLS environment if src->haveTLS is on

We make sure that the disk supports TLS when preparing the environment
so there's no need to duplicate checks.

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

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 469c752438..91b7b8ea32 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -766,8 +766,6 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd,
 
 
 /* qemuBuildDiskSrcTLSx509CommandLine:
- *
- * Add TLS object if the disk src uses a secure communication channel
  *
  * Returns 0 on success, -1 w/ error on some sort of failure.
  */
@@ -776,17 +774,12 @@ qemuBuildDiskSrcTLSx509CommandLine(virCommandPtr cmd,
                                    virStorageSourcePtr src,
                                    virQEMUCapsPtr qemuCaps)
 {
+    if (src->haveTLS != VIR_TRISTATE_BOOL_YES)
+        return 0;
 
-
-    /* other protocols may be added later */
-    if (src->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS &&
-        src->haveTLS == VIR_TRISTATE_BOOL_YES) {
-        return qemuBuildTLSx509CommandLine(cmd, src->tlsCertdir,
-                                           false, src->tlsVerify,
-                                           NULL, src->tlsAlias, qemuCaps);
-    }
-
-    return 0;
+    return qemuBuildTLSx509CommandLine(cmd, src->tlsCertdir,
+                                       false, src->tlsVerify,
+                                       NULL, src->tlsAlias, qemuCaps);
 }