diff options
| author | Peter Krempa <pkrempa@redhat.com> | 2022-09-22 17:33:56 +0200 |
|---|---|---|
| committer | Peter Krempa <pkrempa@redhat.com> | 2022-10-06 10:54:24 +0200 |
| commit | 7782bc39fea1ea7dc36e70c72b56c4ff65f64979 (patch) | |
| tree | c961652ade764d85a08ddcd33f2335fbca4e2d96 /src/test | |
| parent | 2a166e6c1289ca8d137f34fb976130b10d834414 (diff) | |
| download | libvirt-7782bc39fea1ea7dc36e70c72b56c4ff65f64979.tar.gz | |
conf: snapshot: Remove virDomainSnapshotDefParseNode
Check the root XML node name and fetch XPath context by properly
configuring virXMLParse. Callers can use virDomainSnapshotDefParse
instead.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_driver.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5a4e240d35..50c8a7e2be 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -961,25 +961,23 @@ testParseDomainSnapshots(testDriver *privconn, const char *file, xmlXPathContextPtr ctxt) { + VIR_XPATH_NODE_AUTORESTORE(ctxt) size_t i; testDomainNamespaceDef *nsdata = domobj->def->namespaceData; xmlNodePtr *nodes = nsdata->snap_nodes; - bool cur; for (i = 0; i < nsdata->num_snap_nodes; i++) { virDomainMomentObj *snap; g_autoptr(virDomainSnapshotDef) def = NULL; - xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file); - if (!node) + unsigned int parseFlags = VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL | + VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE; + bool cur; + + if (!(ctxt->node = testParseXMLDocFromFile(nodes[i], file))) return -1; - def = virDomainSnapshotDefParseNode(ctxt->doc, node, - privconn->xmlopt, - NULL, - &cur, - VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL | - VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE); - if (!def) + if (!(def = virDomainSnapshotDefParse(ctxt, privconn->xmlopt, NULL, + &cur, parseFlags))) return -1; if (!(snap = virDomainSnapshotAssignDef(domobj->snapshots, &def))) |