From 3bd5ceb68a3b41ab03cef7931cd7a28c3f428f35 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 24 Oct 2022 15:24:44 +0200 Subject: [PATCH] virDomainTimerDefParseXML: Use virXMLProp instead of virXPath MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Parse the 'frequency' field without an extra XPath. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6c976b366a..2d01693a31 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10545,7 +10545,6 @@ virDomainTimerDefParseXML(xmlNodePtr node, g_autofree virDomainTimerDef *def = g_new0(virDomainTimerDef, 1); VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr catchup; - int ret; ctxt->node = node; @@ -10566,15 +10565,8 @@ virDomainTimerDefParseXML(xmlNodePtr node, VIR_XML_PROP_NONZERO, &def->track) < 0) return NULL; - - ret = virXPathULongLong("string(./@frequency)", ctxt, &def->frequency); - if (ret == -1) { - def->frequency = 0; - } else if (ret < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("invalid timer frequency")); + if (virXMLPropULongLong(node, "frequency", 10, VIR_XML_PROP_NONE, &def->frequency) < 0) return NULL; - } if (virXMLPropEnum(node, "mode", virDomainTimerModeTypeFromString, VIR_XML_PROP_NONZERO, &def->mode) < 0) -- 2.47.2