External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDomainTimerDefParseXML: Use virXMLProp instead of virXPath

Browse Source 
Parse the 'frequency' field without an extra XPath.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-10-24 15:24:44 +02:00
parent 51e6ae319d
commit 3bd5ceb68a
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/conf/domain_conf.c
View File

@ -10545,7 +10545,6 @@ virDomainTimerDefParseXML(xmlNodePtr node,
g_autofree virDomainTimerDef *def = g_new0(virDomainTimerDef, 1); g_autofree virDomainTimerDef *def = g_new0(virDomainTimerDef, 1);
VIR_XPATH_NODE_AUTORESTORE(ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr catchup; xmlNodePtr catchup;
int ret;
ctxt->node = node; ctxt->node = node;
@ -10566,15 +10565,8 @@ virDomainTimerDefParseXML(xmlNodePtr node,
VIR_XML_PROP_NONZERO, &def->track) < 0) VIR_XML_PROP_NONZERO, &def->track) < 0)
return NULL; return NULL;
if (virXMLPropULongLong(node, "frequency", 10, VIR_XML_PROP_NONE, &def->frequency) < 0)
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"));
return NULL; return NULL;
}
if (virXMLPropEnum(node, "mode", virDomainTimerModeTypeFromString, if (virXMLPropEnum(node, "mode", virDomainTimerModeTypeFromString,
VIR_XML_PROP_NONZERO, &def->mode) < 0) VIR_XML_PROP_NONZERO, &def->mode) < 0)