From a2c05f1a03ef8810fbe81ecea60ca4bcbe6ca4f2 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 16 Sep 2022 16:51:36 +0200 Subject: [PATCH] conf: domain: Move 'virDomainChrSourceReconnectDefParseXML' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the function in place of its forward declaration. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 48 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 05a12a48a8..26576da5bd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1481,7 +1481,27 @@ virDomainChrSourceDefFormat(virBuffer *buf, static int virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDef *def, xmlNodePtr node, - xmlXPathContextPtr ctxt); + xmlXPathContextPtr ctxt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + xmlNodePtr cur; + + ctxt->node = node; + + if ((cur = virXPathNode("./reconnect", ctxt))) { + if (virXMLPropTristateBool(cur, "enabled", VIR_XML_PROP_NONE, + &def->enabled) < 0) + return -1; + + if (def->enabled == VIR_TRISTATE_BOOL_YES) { + if (virXMLPropUInt(cur, "timeout", 10, VIR_XML_PROP_REQUIRED, + &def->timeout) < 0) + return -1; + } + } + + return 0; +} static int virDomainObjOnceInit(void) @@ -8777,32 +8797,6 @@ virDomainNetAppendIPAddress(virDomainNetDef *def, } -static int -virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDef *def, - xmlNodePtr node, - xmlXPathContextPtr ctxt) -{ - VIR_XPATH_NODE_AUTORESTORE(ctxt) - xmlNodePtr cur; - - ctxt->node = node; - - if ((cur = virXPathNode("./reconnect", ctxt))) { - if (virXMLPropTristateBool(cur, "enabled", VIR_XML_PROP_NONE, - &def->enabled) < 0) - return -1; - - if (def->enabled == VIR_TRISTATE_BOOL_YES) { - if (virXMLPropUInt(cur, "timeout", 10, VIR_XML_PROP_REQUIRED, - &def->timeout) < 0) - return -1; - } - } - - return 0; -} - - static int virDomainNetTeamingInfoParseXML(xmlXPathContextPtr ctxt, virDomainNetTeamingInfo **teaming)