From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 23 Sep 2022 12:42:18 +0000 (+0200)
Subject: virsh: Use proper helper for parsing XML in virshDumpXML
X-Git-Tag: v8.9.0-rc1~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1cd95cc28ea09c1c76a61ffcb33c6c42b86d844;p=thirdparty%2Flibvirt.git

virsh: Use proper helper for parsing XML in virshDumpXML

Use virXMLParseStringCtxt instead of virXMLParseString since the code
requires a XPath context anyways.

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

diff --git a/tools/virsh-util.c b/tools/virsh-util.c
index 8a20f627a1..3c4a084441 100644
--- a/tools/virsh-util.c
+++ b/tools/virsh-util.c
@@ -457,14 +457,11 @@ virshDumpXML(vshControl *ctl,
     }
 
     oldblanks = xmlKeepBlanksDefault(0);
-    doc = virXMLParseString(xml, url);
+    doc = virXMLParseStringCtxt(xml, url, &ctxt);
     xmlKeepBlanksDefault(oldblanks);
     if (!doc)
         return false;
 
-    if (!(ctxt = virXMLXPathContextNew(doc)))
-        return false;
-
     if ((nnodes = virXPathNodeSet(xpath, ctxt, &nodes)) < 0) {
         return false;
     }