External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 03:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: storage: remove virStorageSource->tlsVerify

Browse Source 
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>
This commit is contained in:
Peter Krempa 2018-05-31 14:10:47 +02:00
parent f18771d41c
commit 0b9451f9d6
5 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_command.c
View File

@ -774,7 +774,7 @@ qemuBuildDiskSrcTLSx509CommandLine(virCommandPtr cmd,
return 0; return 0;
return qemuBuildTLSx509CommandLine(cmd, src->tlsCertdir, return qemuBuildTLSx509CommandLine(cmd, src->tlsCertdir,
false, src->tlsVerify, false, true,
NULL, src->tlsAlias, qemuCaps); NULL, src->tlsAlias, qemuCaps);
} }

2
src/qemu/qemu_domain.c
View File

@ -9946,8 +9946,6 @@ qemuProcessPrepareStorageSourceTLSVxhs(virStorageSourcePtr src,
if (src->haveTLS == VIR_TRISTATE_BOOL_YES) { if (src->haveTLS == VIR_TRISTATE_BOOL_YES) {
if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0) if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0)
return -1; return -1;
src->tlsVerify = true;
} }
return 0; return 0;

3
src/qemu/qemu_hotplug.c
View File

@ -164,8 +164,7 @@ qemuDomainAddDiskSrcTLSObject(virQEMUDriverPtr driver,
if (qemuDomainGetTLSObjects(priv->qemuCaps, NULL, if (qemuDomainGetTLSObjects(priv->qemuCaps, NULL,
src->tlsCertdir, src->tlsCertdir,
false, false, true,
src->tlsVerify,
src->tlsAlias, src->tlsAlias,
&tlsProps, NULL) < 0) &tlsProps, NULL) < 0)
goto cleanup; goto cleanup;

1
src/util/virstoragefile.c
View File

@ -2171,7 +2171,6 @@ virStorageSourceCopy(const virStorageSource *src,
ret->shared = src->shared; ret->shared = src->shared;
ret->haveTLS = src->haveTLS; ret->haveTLS = src->haveTLS;
ret->tlsFromConfig = src->tlsFromConfig; ret->tlsFromConfig = src->tlsFromConfig;
ret->tlsVerify = src->tlsVerify;
ret->detected = src->detected; ret->detected = src->detected;
ret->debugLevel = src->debugLevel; ret->debugLevel = src->debugLevel;
ret->debug = src->debug; ret->debug = src->debug;

1
src/util/virstoragefile.h
View File

@ -310,7 +310,6 @@ struct _virStorageSource {
* certificate directory with listen and verify bools. */ * certificate directory with listen and verify bools. */
char *tlsAlias; char *tlsAlias;
char *tlsCertdir; char *tlsCertdir;
bool tlsVerify;
bool detected; /* true if this entry was not provided by the user */ bool detected; /* true if this entry was not provided by the user */