diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 39ddfb7db0..8d77eb4295 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16795,19 +16795,9 @@ virDomainLoaderDefParseXMLNvram(virDomainLoaderDef *loader, static int -virDomainLoaderDefParseXML(virDomainLoaderDef *loader, - xmlNodePtr loaderNode, - xmlNodePtr nvramNode, - xmlNodePtr nvramSourceNode, - xmlXPathContextPtr ctxt, - virDomainXMLOption *xmlopt, - unsigned int flags) +virDomainLoaderDefParseXMLLoader(virDomainLoaderDef *loader, + xmlNodePtr loaderNode) { - if (virDomainLoaderDefParseXMLNvram(loader, - nvramNode, nvramSourceNode, - ctxt, xmlopt, flags) < 0) - return -1; - if (!loaderNode) return 0; @@ -16837,6 +16827,28 @@ virDomainLoaderDefParseXML(virDomainLoaderDef *loader, } +static int +virDomainLoaderDefParseXML(virDomainLoaderDef *loader, + xmlNodePtr loaderNode, + xmlNodePtr nvramNode, + xmlNodePtr nvramSourceNode, + xmlXPathContextPtr ctxt, + virDomainXMLOption *xmlopt, + unsigned int flags) +{ + if (virDomainLoaderDefParseXMLNvram(loader, + nvramNode, nvramSourceNode, + ctxt, xmlopt, flags) < 0) + return -1; + + if (virDomainLoaderDefParseXMLLoader(loader, + loaderNode) < 0) + return -1; + + return 0; +} + + static int virDomainSchedulerParseCommonAttrs(xmlNodePtr node, virProcessSchedPolicy *policy,