[PATCH] util: storage: remove virStorageSource->tlsVerify

[Peter Krempa <pkrempa@xxxxxxxxxx>]

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.
---

This applies on top of my branch collecting all ACKed postings of
recent blockdev-related work. Current version can be fetched by:

git fetch git://pipo.sk/pipo/libvirt.git blockdev-staging

 src/qemu/qemu_command.c   | 2 +-
 src/qemu/qemu_domain.c    | 2 --
 src/qemu/qemu_hotplug.c   | 3 +--
 src/util/virstoragefile.c | 1 -
 src/util/virstoragefile.h | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 26e61f26f4..c75595ca6d 100644
--- 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 4368e9be35..873bcec50d 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9928,8 +9928,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 c656409eaa..2f76c048aa 100644
--- 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 54de2c1c30..10fe0f201a 100644
--- 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 1631c4cf66..4591e6e213 100644
--- 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 */

-- 
2.16.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list