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

tests: qemuxml2argv: Use virXMLParse properly

Browse Source 
Don't validate the root node and don't allocate a private XPath context
when virXMLParse can do that internally.

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:58:16 +02:00
parent 0dceac9b8e
commit 1cd64b7326
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/qemuxml2argvtest.c
View File

@ -626,7 +626,6 @@ testCompareXMLToArgv(const void *data)
qemuDomainObjPrivate *priv = NULL;
g_autoptr(xmlDoc) xml = NULL;
g_autoptr(xmlXPathContext) ctxt = NULL;
xmlNodePtr root;
g_autofree char *archstr = NULL;
virArch arch = VIR_ARCH_NONE;
g_autoptr(virIdentity) sysident = virIdentityGetSystem();
@ -673,21 +672,9 @@ testCompareXMLToArgv(const void *data)
goto cleanup;
if (!(xml = virXMLParse(info->infile, NULL, "(domain_definition)",
NULL, NULL, NULL, false)))
"domain", &ctxt, NULL, false)))
goto cleanup;
root = xmlDocGetRootElement(xml);
if (!virXMLNodeNameEqual(root, "domain")) {
VIR_TEST_VERBOSE("unexpected root element <%s>, expecting <domain>",
root->name);
goto cleanup;
}
if (!(ctxt = virXMLXPathContextNew(xml)))
goto cleanup;
ctxt->node = root;
if ((archstr = virXPathString("string(./os/type[1]/@arch)", ctxt)))
arch = virArchFromString(archstr);
@ -722,7 +709,7 @@ testCompareXMLToArgv(const void *data)
parseFlags |= VIR_DOMAIN_DEF_PARSE_INACTIVE;
if (!(vm->def = virDomainDefParseNode(xml, root, driver.xmlopt, NULL,
if (!(vm->def = virDomainDefParseNode(xml, ctxt->node, driver.xmlopt, NULL,
parseFlags))) {
err = virGetLastError();
if (!err) {