From: Kristina Hanicova <khanicov@redhat.com>
Date: Wed, 11 Aug 2021 12:36:46 +0000 (+0200)
Subject: domain_conf: replace validation with variables passed to virXMLParse()
X-Git-Tag: v7.7.0-rc1~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6c730c8653e9d812868ea373323cfd9c39ca018;p=thirdparty%2Flibvirt.git

domain_conf: replace validation with variables passed to virXMLParse()

virXMLParse() now allows to validate xml against schema directly,
eliminating the need to do it individually.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b996a0cc3c..492d5524ec 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -19515,7 +19515,7 @@ virDomainDefControllersParse(virDomainDef *def,
 }
 
 static virDomainDef *
-virDomainDefParseXML(xmlDocPtr xml,
+virDomainDefParseXML(xmlDocPtr xml G_GNUC_UNUSED,
                      xmlXPathContextPtr ctxt,
                      virDomainXMLOption *xmlopt,
                      unsigned int flags)
@@ -19529,18 +19529,6 @@ virDomainDefParseXML(xmlDocPtr xml,
     g_autofree xmlNodePtr *nodes = NULL;
     g_autofree char *tmp = NULL;
 
-    if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA) {
-        g_autofree char *schema = NULL;
-
-        schema = virFileFindResource("domain.rng",
-                                     abs_top_srcdir "/docs/schemas",
-                                     PKGDATADIR "/schemas");
-        if (!schema)
-            return NULL;
-        if (virXMLValidateAgainstSchema(schema, xml) < 0)
-            return NULL;
-    }
-
     if (!(def = virDomainDefNew()))
         return NULL;
 
@@ -20400,7 +20388,8 @@ virDomainDefParse(const char *xmlStr,
     virDomainDef *def = NULL;
     int keepBlanksDefault = xmlKeepBlanksDefault(0);
     xmlNodePtr root;
-    if (!(xml = virXMLParse(filename, xmlStr, _("(domain_definition)"), NULL, false)))
+    if (!(xml = virXMLParse(filename, xmlStr, _("(domain_definition)"), "domain.rng",
+                            flags & VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA)))
         goto cleanup;
 
     root = xmlDocGetRootElement(xml);