]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: Don't encode matrix of storage protocols supporting TLS in the parser
authorPeter Krempa <pkrempa@redhat.com>
Wed, 30 May 2018 09:03:28 +0000 (11:03 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 5 Jun 2018 06:13:58 +0000 (08:13 +0200)
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>
src/conf/domain_conf.c

index d2f6829cbbfcdaaddf30d971ec0a18258efab656..71daa539e3fe9b520e84f9145b793ee9c88061ed 100644 (file)
@@ -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) &&