util: storage: remove virStorageSource->tlsVerify

Disks are client-only so we don't need to have this variable. We also
always pass false for 'isListen' to qemuBuildTLSx509BackendProps for all
disk-related code-paths so the 'tlsVerify' is ignored anyways.

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 96e762a9e8a1255a5894923dc50107a1bd8c6470..f4f958f278fa6cd91ae0bb613cdbdcbc4cd2501d 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -774,7 +774,7 @@ qemuBuildDiskSrcTLSx509CommandLine(virCommandPtr cmd,
         return 0;
 
     return qemuBuildTLSx509CommandLine(cmd, src->tlsCertdir,
-                                       false, src->tlsVerify,
+                                       false, true,
                                        NULL, src->tlsAlias, qemuCaps);
 }
 

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index a7188e9127ccd36dad0ac8a4ba13f8b589d9d6f6..2792fa7569a6228f4772d9322ecd3afd200666fd 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9946,8 +9946,6 @@ qemuProcessPrepareStorageSourceTLSVxhs(virStorageSourcePtr src,
     if (src->haveTLS == VIR_TRISTATE_BOOL_YES) {
         if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0)
             return -1;
-
-        src->tlsVerify = true;
     }
 
     return 0;

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 2be08ff90a042f6c98ef2d2aa01c919029680df1..7dc9276ff75b7eac373e85fd4f667e702b3c25ba 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -164,8 +164,7 @@ qemuDomainAddDiskSrcTLSObject(virQEMUDriverPtr driver,
 
     if (qemuDomainGetTLSObjects(priv->qemuCaps, NULL,
                                 src->tlsCertdir,
-                                false,
-                                src->tlsVerify,
+                                false, true,
                                 src->tlsAlias,
                                 &tlsProps, NULL) < 0)
         goto cleanup;

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 54de2c1c3059cb1a43ae610430381a66a4698be3..10fe0f201a96ff7076699e36524ae00652985ae3 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2171,7 +2171,6 @@ virStorageSourceCopy(const virStorageSource *src,
     ret->shared = src->shared;
     ret->haveTLS = src->haveTLS;
     ret->tlsFromConfig = src->tlsFromConfig;
-    ret->tlsVerify = src->tlsVerify;
     ret->detected = src->detected;
     ret->debugLevel = src->debugLevel;
     ret->debug = src->debug;

diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 1631c4cf66ae9103b775fd1f6b057ec9109d5464..4591e6e2138b8f01d88aa75620af5a1596d0ea7e 100644 (file)
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -310,7 +310,6 @@ struct _virStorageSource {
      * certificate directory with listen and verify bools. */
     char *tlsAlias;
     char *tlsCertdir;
-    bool tlsVerify;
 
     bool detected; /* true if this entry was not provided by the user */