External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vbox: snapshot_conf: Don't allocate XPath context explicitly

Browse Source 
Use the one provided via virXMLParse.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-09-22 15:12:20 +02:00
parent 2597e16e29
commit 366cb6d35a
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/vbox/vbox_snapshot_conf.c
View File

@ -584,15 +584,12 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
machineDescription = g_new0(virVBoxSnapshotConfMachine, 1);
xml = virXMLParse(filePath, NULL, NULL, NULL, NULL, NULL, false);
xml = virXMLParse(filePath, NULL, NULL, NULL, &xPathContext, NULL, false);
if (xml == NULL) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Unable to parse the xml"));
goto cleanup;
}
if (!(xPathContext = virXMLXPathContextNew(xml)))
goto cleanup;
if (xmlXPathRegisterNs(xPathContext,
BAD_CAST "vbox",
BAD_CAST VBOX_SETTINGS_NS) < 0) {
@ -603,8 +600,6 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
}
/* Retrieve MachineNode */
cur = xmlDocGetRootElement(xml);
xPathContext->node = cur;
machineNode = virXPathNode("./vbox:Machine", xPathContext);
if (machineNode == NULL) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@ -1214,17 +1209,13 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(const char *filePath,
_("filePath is null"));
goto cleanup;
}
xml = virXMLParse(filePath, NULL, NULL, NULL, NULL, NULL, false);
xml = virXMLParse(filePath, NULL, NULL, NULL, &xPathContext, NULL, false);
if (xml == NULL) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Unable to parse the xml"));
goto cleanup;
}
if (!(xPathContext = virXMLXPathContextNew(xml)))
goto cleanup;
xPathContext->node = xmlDocGetRootElement(xml);
if ((nodeSize = virXPathNodeSet("/domainsnapshot/disks/disk",
xPathContext, &nodes)) < 0)
goto cleanup;
@ -1271,17 +1262,13 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(const char *filePath,
_("filePath is null"));
goto cleanup;
}
xml = virXMLParse(filePath, NULL, NULL, NULL, NULL, NULL, false);
xml = virXMLParse(filePath, NULL, NULL, NULL, &xPathContext, NULL, false);
if (xml == NULL) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Unable to parse the xml"));
goto cleanup;
}
if (!(xPathContext = virXMLXPathContextNew(xml)))
goto cleanup;
xPathContext->node = xmlDocGetRootElement(xml);
if ((nodeSize = virXPathNodeSet("/domainsnapshot/domain/devices/disk",
xPathContext,
&nodes)) < 0)