From 7b19f63e5dd651ed72d01501d62ad6a881f9ab53 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 30 May 2018 11:03:28 +0200 Subject: [PATCH] conf: Don't encode matrix of storage protocols supporting TLS in the parser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Always parse the 'tls' source field and let the drivers decide whether they support it. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d2f6829cbb..71daa539e3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8684,17 +8684,11 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, goto cleanup; } - /* Check tls=yes|no domain setting for the block device - * At present only VxHS. Other block devices may be added later */ - if (src->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS && - (haveTLS = virXMLPropString(node, "tls"))) { - if ((src->haveTLS = - virTristateBoolTypeFromString(haveTLS)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown disk source 'tls' setting '%s'"), - haveTLS); + if ((haveTLS = virXMLPropString(node, "tls")) && + (src->haveTLS = virTristateBoolTypeFromString(haveTLS)) <= 0) { + virReportError(VIR_ERR_XML_ERROR, + _("unknown disk source 'tls' setting '%s'"), haveTLS); goto cleanup; - } } if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && -- GitLab