util: xml: Remove virXMLParseString

Most callers use virXMLParseStringCtxt. Convert the last use case
and remove the helper.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bf165d0a64fe485ed337977f6a8f5328a00df260..70501ca76876cfa680e45b773b4e3db20b394eed 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -28851,7 +28851,7 @@ virDomainDefSetMetadata(virDomainDef *def,
         if (metadata) {
 
             /* parse and modify the xml from the user */
-            if (!(doc = virXMLParseString(metadata, _("(metadata_xml)"))))
+            if (!(doc = virXMLParseStringCtxt(metadata, _("(metadata_xml)"), NULL)))
                 return -1;
 
             if (virXMLInjectNamespace(doc->children, uri, key) < 0)

diff --git a/src/util/virxml.h b/src/util/virxml.h
index 0a5759fd45836a7b2408fe4344118b04dbf3c728..8f193f60bb8c03e2837b88f4ef7b91a18cd79172 100644 (file)
--- a/src/util/virxml.h
+++ b/src/util/virxml.h
@@ -216,18 +216,6 @@ virXMLPickShellSafeComment(const char *str1,
 #define virXMLParse(filename, xmlStr, url, rootelement, ctxt, schemafile, validate) \
     virXMLParseHelper(VIR_FROM_THIS, filename, xmlStr, url, rootelement, ctxt, schemafile, validate)
 
-/**
- * virXMLParseString:
- * @xmlStr: a string to parse
- * @url: an optional filename to attribute the parse to
- *
- * Parse xml from a string.
- *
- * Return the parsed document object, or NULL on failure.
- */
-#define virXMLParseString(xmlStr, url) \
-    virXMLParseHelper(VIR_FROM_THIS, NULL, xmlStr, url, NULL, NULL, NULL, false)
-
 /**
  * virXMLParseFile:
  * @filename: file to parse