External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-23 04:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Don't encode matrix of storage protocols supporting TLS in the parser

Browse Source 
Always parse the 'tls' source field and let the drivers decide whether
they support it.

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-30 11:03:28 +02:00
parent aa163d2513
commit 7b19f63e5d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/domain_conf.c
View File

@ -8684,18 +8684,12 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
goto cleanup; goto cleanup;
} }
/* Check tls=yes|no domain setting for the block device if ((haveTLS = virXMLPropString(node, "tls")) &&
* At present only VxHS. Other block devices may be added later */ (src->haveTLS = virTristateBoolTypeFromString(haveTLS)) <= 0) {
if (src->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS &&
(haveTLS = virXMLPropString(node, "tls"))) {
if ((src->haveTLS =
virTristateBoolTypeFromString(haveTLS)) <= 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("unknown disk source 'tls' setting '%s'"), _("unknown disk source 'tls' setting '%s'"), haveTLS);
haveTLS);
goto cleanup; goto cleanup;
} }
}
if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) &&
(tlsCfg = virXMLPropString(node, "tlsFromConfig"))) { (tlsCfg = virXMLPropString(node, "tlsFromConfig"))) {