External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Avoid checking root element name in virDomainDefParseNode

Browse Source 
The only caller for which this check makes sense is virDomainDefParse.
Thus the check should be moved there.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Jiri Denemark 2019-09-09 22:26:12 +02:00
parent 9bcbc52ef1
commit 29307fa84d
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/conf/domain_conf.c
View File

@ -21520,12 +21520,21 @@ virDomainDefParse(const char *xmlStr,
xmlDocPtr xml = NULL; xmlDocPtr xml = NULL;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
int keepBlanksDefault = xmlKeepBlanksDefault(0); int keepBlanksDefault = xmlKeepBlanksDefault(0);
xmlNodePtr root;
if (!(xml = virXMLParse(filename, xmlStr, _("(domain_definition)")))) if (!(xml = virXMLParse(filename, xmlStr, _("(domain_definition)"))))
goto cleanup; goto cleanup;
def = virDomainDefParseNode(xml, xmlDocGetRootElement(xml), caps, root = xmlDocGetRootElement(xml);
xmlopt, parseOpaque, flags); if (!virXMLNodeNameEqual(root, "domain")) {
virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, "
"expecting <domain>"),
root->name);
goto cleanup;
}
def = virDomainDefParseNode(xml, root, caps, xmlopt, parseOpaque, flags);
cleanup: cleanup:
xmlFreeDoc(xml); xmlFreeDoc(xml);
@ -21566,14 +21575,6 @@ virDomainDefParseNode(xmlDocPtr xml,
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
virDomainDefPtr ret = NULL; virDomainDefPtr ret = NULL;
if (!virXMLNodeNameEqual(root, "domain")) {
virReportError(VIR_ERR_XML_ERROR,
_("unexpected root element <%s>, "
"expecting <domain>"),
root->name);
goto cleanup;
}
ctxt = xmlXPathNewContext(xml); ctxt = xmlXPathNewContext(xml);
if (ctxt == NULL) { if (ctxt == NULL) {
virReportOOMError(); virReportOOMError();