From: Daniel P. Berrangé <berrange@redhat.com>
Date: Wed, 24 Feb 2021 13:05:01 +0000 (+0000)
Subject: conf: don't force existance of audio child elements
X-Git-Tag: v7.2.0-rc1~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe304b02f01aec6f2f1b20b6ae0ae07f9b9f0b9a;p=thirdparty%2Flibvirt.git

conf: don't force existance of audio child elements

The attributes on the elements are optional, so we should not force the
elements themselves to be present, especially since we omit them when
formating the XML thus breaking round-tripping.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2ed6ac33a4..756459eacb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13914,15 +13914,10 @@ virDomainAudioDefParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED,
         inputDevNode = virXPathNode("./input", ctxt);
         outputDevNode = virXPathNode("./output", ctxt);
 
-        if (!inputDevNode || !outputDevNode) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("Audio type OSS requires to have <input> "
-                             "and <output> specified"));
-            goto error;
-        }
-
-        def->backend.oss.inputDev = virXMLPropString(inputDevNode, "dev");
-        def->backend.oss.outputDev = virXMLPropString(outputDevNode, "dev");
+        if (inputDevNode)
+            def->backend.oss.inputDev = virXMLPropString(inputDevNode, "dev");
+        if (outputDevNode)
+            def->backend.oss.outputDev = virXMLPropString(outputDevNode, "dev");
         break;
     }