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

virDomainTimerCatchupDef: Change members to 'unsigned long long'

Browse Source 
The struct used 'unsigned long' variables which we try to avoid due to
being different size on different architectures.

Convert the struct and use virXMLPropULongLong instead of virXPathULong
when parsing the XML.

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-05 15:47:49 +02:00
parent 1de6fd5edb
commit a9294713d8
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/conf/domain_conf.c
View File

@ -10610,33 +10610,17 @@ virDomainTimerDefParseXML(xmlNodePtr node,
catchup = virXPathNode("./catchup", ctxt);
if (catchup != NULL) {
ret = virXPathULong("string(./catchup/@threshold)", ctxt,
&def->catchup.threshold);
if (ret == -1) {
def->catchup.threshold = 0;
} else if (ret < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("invalid catchup threshold"));
if (virXMLPropULongLong(catchup, "threshold", 10, VIR_XML_PROP_NONE,
&def->catchup.threshold) < 0)
goto error;
}
ret = virXPathULong("string(./catchup/@slew)", ctxt, &def->catchup.slew);
if (ret == -1) {
def->catchup.slew = 0;
} else if (ret < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("invalid catchup slew"));
if (virXMLPropULongLong(catchup, "slew", 10, VIR_XML_PROP_NONE,
&def->catchup.slew) < 0)
goto error;
}
ret = virXPathULong("string(./catchup/@limit)", ctxt, &def->catchup.limit);
if (ret == -1) {
def->catchup.limit = 0;
} else if (ret < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("invalid catchup limit"));
if (virXMLPropULongLong(catchup, "limit", 10, VIR_XML_PROP_NONE,
&def->catchup.limit) < 0)
goto error;
}
}
return def;
@ -24896,11 +24880,11 @@ virDomainTimerDefFormat(virBuffer *buf,
}
if (def->catchup.threshold > 0)
virBufferAsprintf(&catchupAttr, " threshold='%lu'", def->catchup.threshold);
virBufferAsprintf(&catchupAttr, " threshold='%llu'", def->catchup.threshold);
if (def->catchup.slew > 0)
virBufferAsprintf(&catchupAttr, " slew='%lu'", def->catchup.slew);
virBufferAsprintf(&catchupAttr, " slew='%llu'", def->catchup.slew);
if (def->catchup.limit > 0)
virBufferAsprintf(&catchupAttr, " limit='%lu'", def->catchup.limit);
virBufferAsprintf(&catchupAttr, " limit='%llu'", def->catchup.limit);
virXMLFormatElement(&timerChld, "catchup", &catchupAttr, NULL);
virXMLFormatElement(buf, "timer", &timerAttr, &timerChld);

6
src/conf/domain_conf.h
View File

@ -2466,9 +2466,9 @@ struct _virDomainThreadSchedParam {
};
struct _virDomainTimerCatchupDef {
unsigned long threshold;
unsigned long slew;
unsigned long limit;
unsigned long long threshold;
unsigned long long slew;
unsigned long long limit;
};
struct _virDomainTimerDef {