mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-31 00:45:18 +00:00
qemuxml2argvtest: Use virDomainDefParseFile instead of virXMLParse+virDomainDefParseNode
As we don't do any additional parsing of the input file in qemuxml2argvtest we can simplify the code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
afe5c6f504
commit
59d70e3a41
@ -616,8 +616,6 @@ testCompareXMLToArgv(const void *data)
|
||||
g_autofree char *log = NULL;
|
||||
g_autoptr(virCommand) cmd = NULL;
|
||||
qemuDomainObjPrivate *priv = NULL;
|
||||
g_autoptr(xmlDoc) xml = NULL;
|
||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||
g_autoptr(virIdentity) sysident = virIdentityGetSystem();
|
||||
|
||||
/* mark test case as used */
|
||||
@ -669,10 +667,6 @@ testCompareXMLToArgv(const void *data)
|
||||
if (testCheckExclusiveFlags(info->flags) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (!(xml = virXMLParse(info->infile, NULL, "(domain_definition)",
|
||||
"domain", &ctxt, NULL, false)))
|
||||
goto cleanup;
|
||||
|
||||
virFileCacheClear(driver.qemuCapsCache);
|
||||
|
||||
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
|
||||
@ -702,7 +696,7 @@ testCompareXMLToArgv(const void *data)
|
||||
|
||||
parseFlags |= VIR_DOMAIN_DEF_PARSE_INACTIVE;
|
||||
|
||||
if (!(vm->def = virDomainDefParseNode(ctxt, driver.xmlopt, NULL, parseFlags))) {
|
||||
if (!(vm->def = virDomainDefParseFile(info->infile, driver.xmlopt, NULL, parseFlags))) {
|
||||
err = virGetLastError();
|
||||
if (!err) {
|
||||
VIR_TEST_DEBUG("no error was reported for expected parse error");
|
||||
|
Loading…
x
Reference in New Issue
Block a user