]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virDomainTimerDefParseXML: Use virXMLProp instead of virXPath
authorPeter Krempa <pkrempa@redhat.com>
Mon, 24 Oct 2022 13:24:44 +0000 (15:24 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 2 Nov 2022 08:20:58 +0000 (09:20 +0100)
Parse the 'frequency' field without an extra XPath.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/conf/domain_conf.c

index 6c976b366ac88b45d1eef689e4caed98999fa368..2d01693a310350287747478ebf9346ded1a4e594 100644 (file)
@@ -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)