From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 4 Jun 2020 12:57:12 +0000 (+0200)
Subject: virSysinfoParseXML: Mangle ctxt inside virSysinfoParseXML()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b934d5f42f29764277bc6f0f1cae19ada6f85e74;p=libvirt.git

virSysinfoParseXML: Mangle ctxt inside virSysinfoParseXML()

There's no need to set ctxt->node outside of the function. The
function can set it itself - it has all the info needed.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e84fbe1e21..57a5b7befe 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -15714,10 +15714,13 @@ virSysinfoParseXML(xmlNodePtr node,
                   unsigned char *domUUID,
                   bool uuid_generated)
 {
+    VIR_XPATH_NODE_AUTORESTORE(ctxt);
     virSysinfoDefPtr def;
     xmlNodePtr tmpnode;
     g_autofree char *type = NULL;
 
+    ctxt->node = node;
+
     if (!virXMLNodeNameEqual(node, "sysinfo")) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("XML does not contain expected 'sysinfo' element"));
@@ -22179,8 +22182,6 @@ virDomainDefParseXML(xmlDocPtr xml,
     }
 
     if ((node = virXPathNode("./sysinfo[1]", ctxt)) != NULL) {
-        VIR_XPATH_NODE_AUTORESTORE(ctxt);
-        ctxt->node = node;
         def->sysinfo = virSysinfoParseXML(node, ctxt,
                                           def->uuid, uuid_generated);