External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

prlsdkParseSnapshotTree: Simplify XML parsing code

Browse Source 
Use features of virXMLParse to validate root node and fetch XPath
context.

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 17:53:04 +02:00
parent 7c32578531
commit b1190e08ff
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/vz/vz_sdk.c
View File

@ -4566,7 +4566,6 @@ prlsdkParseSnapshotTree(const char *treexml)
virDomainSnapshotObjList *ret = NULL;
g_autoptr(xmlDoc) xml = NULL;
g_autoptr(xmlXPathContext) ctxt = NULL;
xmlNodePtr root;
xmlNodePtr *nodes = NULL;
virDomainSnapshotDef *def = NULL;
virDomainMomentObj *snapshot;
@ -4582,21 +4581,9 @@ prlsdkParseSnapshotTree(const char *treexml)
return snapshots;
if (!(xml = virXMLParse(NULL, treexml, _("(snapshot_tree)"),
NULL, NULL, NULL, false)))
"ParallelsSavedStates", &ctxt, NULL, false)))
goto cleanup;
root = xmlDocGetRootElement(xml);
if (!virXMLNodeNameEqual(root, "ParallelsSavedStates")) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected root element: '%s'"), root->name);
goto cleanup;
}
if (!(ctxt = virXMLXPathContextNew(xml)))
goto cleanup;
ctxt->node = root;
if ((n = virXPathNodeSet("//SavedStateItem", ctxt, &nodes)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("cannot extract snapshot nodes"));
@ -4604,7 +4591,7 @@ prlsdkParseSnapshotTree(const char *treexml)
}
for (i = 0; i < n; i++) {
if (nodes[i]->parent == root)
if (nodes[i]->parent == xmlDocGetRootElement(xml))
continue;
def = g_new0(virDomainSnapshotDef, 1);