External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virSysinfoParseXML: Mangle ctxt inside virSysinfoParseXML()

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2020-06-04 14:57:12 +02:00
parent 5dd52ecbcf
commit b934d5f42f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conf/domain_conf.c
View File

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