From: Peter Krempa Date: Fri, 23 Sep 2022 12:44:25 +0000 (+0200) Subject: util: xml: Remove virXMLParseString X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5d2f69aa68dc96d66a38f99d330c3320cbb3b949;p=libvirt.git util: xml: Remove virXMLParseString Most callers use virXMLParseStringCtxt. Convert the last use case and remove the helper. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bf165d0a64..70501ca768 100644 --- 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 0a5759fd45..8f193f60bb 100644 --- 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