Add virXMLValidateAgainstSchema helper method

Add a helper method that can validate an XML document against
an RNG schema

diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h
index 85dd74cbbe957c6ea37ddf0449e2d4ab05251c21..3d3d80a1d7dd6d23c01e3b1de2e84b04cee2b115 100644 (file)
--- a/include/libvirt/virterror.h
+++ b/include/libvirt/virterror.h
@@ -304,6 +304,7 @@ typedef enum {
     VIR_ERR_STORAGE_VOL_EXIST = 90,     /* the storage vol already exists */
     VIR_ERR_CPU_INCOMPATIBLE = 91,      /* given CPU is incompatible with host
                                            CPU*/
+    VIR_ERR_XML_INVALID_SCHEMA = 92,    /* XML document doens't validate against schema */
 } virErrorNumber;
 
 /**

diff --git a/src/internal.h b/src/internal.h
index 30445c12672e544e6a05f47b0405b199d34c390d..9855c499127ea78d70059c04dbc0c8a540d1526f 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -234,11 +234,15 @@
 #  define VIR_WARNINGS_NO_CAST_ALIGN \
     _Pragma ("GCC diagnostic push") \
     _Pragma ("GCC diagnostic ignored \"-Wcast-align\"")
+#  define VIR_WARNINGS_NO_PRINTF \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=format\"")
 
 #  define VIR_WARNINGS_RESET \
     _Pragma ("GCC diagnostic pop")
 # else
 #  define VIR_WARNINGS_NO_CAST_ALIGN
+#  define VIR_WARNINGS_NO_PRINTF
 #  define VIR_WARNINGS_RESET
 # endif
 

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 7ceb54dcf36791d27551d79f777cab618b6f98f3..7a2c585ef2591857c36122fda2abd5a5b64768ba 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2252,6 +2252,7 @@ virXMLParseHelper;
 virXMLPickShellSafeComment;
 virXMLPropString;
 virXMLSaveFile;
+virXMLValidateAgainstSchema;
 virXPathBoolean;
 virXPathInt;
 virXPathLong;

diff --git a/src/util/virerror.c b/src/util/virerror.c
index 4aa6d04088847e51fe23dc64118440a529e18896..f5d7f54fd84f3d13500a581aacca115d39b46fe8 100644 (file)
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -1285,6 +1285,12 @@ virErrorMsg(virErrorNumber error, const char *info)
             else
                 errmsg = _("the CPU is incompatible with host CPU: %s");
             break;
+        case VIR_ERR_XML_INVALID_SCHEMA:
+            if (info == NULL)
+                errmsg = _("XML document failed to validate against schema");
+            else
+                errmsg = _("XML document failed to validate against schema: %s");
+            break;
     }
     return errmsg;
 }

diff --git a/src/util/virxml.c b/src/util/virxml.c
index 93f8590cded84d3b65f494eaa1197a76cfc84400..489bad8d5ebd4e82ec491faeae05d1b065a379ff 100644 (file)
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -1082,3 +1082,82 @@ virXMLInjectNamespace(xmlNodePtr node,
 
     return 0;
 }
+
+static void catchRNGError(void *ctx,
+                          const char *msg,
+                          ...)
+{
+    virBufferPtr buf = ctx;
+    va_list args;
+
+    va_start(args, msg);
+    VIR_WARNINGS_NO_PRINTF;
+    virBufferVasprintf(buf, msg, args);
+    VIR_WARNINGS_RESET;
+    va_end(args);
+}
+
+
+static void ignoreRNGError(void *ctx ATTRIBUTE_UNUSED,
+                           const char *msg ATTRIBUTE_UNUSED,
+                           ...)
+{}
+
+
+int
+virXMLValidateAgainstSchema(const char *schemafile,
+                            xmlDocPtr doc)
+{
+    xmlRelaxNGParserCtxtPtr rngParser = NULL;
+    xmlRelaxNGPtr rng = NULL;
+    xmlRelaxNGValidCtxtPtr rngValid = NULL;
+    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    int ret = -1;
+
+    if (!(rngParser = xmlRelaxNGNewParserCtxt(schemafile))) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Unable to create RNG parser for %s"),
+                       schemafile);
+        goto cleanup;
+    }
+
+    xmlRelaxNGSetParserErrors(rngParser,
+                              catchRNGError,
+                              ignoreRNGError,
+                              &buf);
+
+    if (!(rng = xmlRelaxNGParse(rngParser))) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Unable to parse RNG %s: %s"),
+                       schemafile, virBufferCurrentContent(&buf));
+        goto cleanup;
+    }
+
+    if (!(rngValid = xmlRelaxNGNewValidCtxt(rng))) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Unable to create RNG validation context %s"),
+                       schemafile);
+        goto cleanup;
+    }
+
+    xmlRelaxNGSetValidErrors(rngValid,
+                             catchRNGError,
+                             ignoreRNGError,
+                             &buf);
+
+    if (xmlRelaxNGValidateDoc(rngValid, doc) != 0) {
+        virReportError(VIR_ERR_XML_INVALID_SCHEMA,
+                       _("Unable to validate doc against %s\n%s"),
+                       schemafile, virBufferCurrentContent(&buf));
+        goto cleanup;
+    }
+
+    ret = 0;
+
+ cleanup:
+    virBufferFreeAndReset(&buf);
+    xmlRelaxNGFreeParserCtxt(rngParser);
+    xmlRelaxNGFreeValidCtxt(rngValid);
+    xmlRelaxNGFree(rng);
+    return ret;
+}

diff --git a/src/util/virxml.h b/src/util/virxml.h
index 781b3bf8f6f41422d0dd377aa74abc2f92b63596..b94de74a5eca3c86ace41c5f1aef1735f100df77 100644 (file)
--- a/src/util/virxml.h
+++ b/src/util/virxml.h
@@ -28,6 +28,7 @@
 # include <libxml/parser.h>
 # include <libxml/tree.h>
 # include <libxml/xpath.h>
+# include <libxml/relaxng.h>
 
 int              virXPathBoolean(const char *xpath,
                                  xmlXPathContextPtr ctxt);
@@ -176,4 +177,8 @@ int virXMLInjectNamespace(xmlNodePtr node,
                           const char *uri,
                           const char *key);
 
+int
+virXMLValidateAgainstSchema(const char *schemafile,
+                            xmlDocPtr xml);
+
 #endif                          /* __VIR_XML_H__ */