mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-31 22:17:17 +00:00
virDomainTimerDef: Convert 'track' field to proper enum type
Adjust the parser and add missing switch cases to make the complier happy. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
7fb8adc7cd
commit
83e1368d95
@ -10546,7 +10546,6 @@ virDomainTimerDefParseXML(xmlNodePtr node,
|
|||||||
VIR_XPATH_NODE_AUTORESTORE(ctxt)
|
VIR_XPATH_NODE_AUTORESTORE(ctxt)
|
||||||
xmlNodePtr catchup;
|
xmlNodePtr catchup;
|
||||||
int ret;
|
int ret;
|
||||||
g_autofree char *track = NULL;
|
|
||||||
g_autofree char *mode = NULL;
|
g_autofree char *mode = NULL;
|
||||||
|
|
||||||
ctxt->node = node;
|
ctxt->node = node;
|
||||||
@ -10564,14 +10563,10 @@ virDomainTimerDefParseXML(xmlNodePtr node,
|
|||||||
VIR_XML_PROP_NONZERO, &def->tickpolicy) < 0)
|
VIR_XML_PROP_NONZERO, &def->tickpolicy) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
track = virXMLPropString(node, "track");
|
if (virXMLPropEnum(node, "track", virDomainTimerTrackTypeFromString,
|
||||||
if (track != NULL) {
|
VIR_XML_PROP_NONZERO, &def->track) < 0)
|
||||||
if ((def->track = virDomainTimerTrackTypeFromString(track)) <= 0) {
|
return NULL;
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("unknown timer track '%s'"), track);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = virXPathULongLong("string(./@frequency)", ctxt, &def->frequency);
|
ret = virXPathULongLong("string(./@frequency)", ctxt, &def->frequency);
|
||||||
if (ret == -1) {
|
if (ret == -1) {
|
||||||
|
@ -2479,7 +2479,7 @@ struct _virDomainTimerDef {
|
|||||||
virDomainTimerCatchupDef catchup;
|
virDomainTimerCatchupDef catchup;
|
||||||
|
|
||||||
/* track is only valid for name='platform|rtc' */
|
/* track is only valid for name='platform|rtc' */
|
||||||
int track; /* enum virDomainTimerTrackType */
|
virDomainTimerTrackType track;
|
||||||
|
|
||||||
/* frequency & mode are only valid for name='tsc' */
|
/* frequency & mode are only valid for name='tsc' */
|
||||||
unsigned long long frequency; /* in Hz, unspecified = 0 */
|
unsigned long long frequency; /* in Hz, unspecified = 0 */
|
||||||
|
@ -5732,6 +5732,8 @@ qemuBuildClockArgStr(virDomainClockDef *def)
|
|||||||
case VIR_DOMAIN_TIMER_TRACK_REALTIME:
|
case VIR_DOMAIN_TIMER_TRACK_REALTIME:
|
||||||
virBufferAddLit(&buf, ",clock=rt");
|
virBufferAddLit(&buf, ",clock=rt");
|
||||||
break;
|
break;
|
||||||
|
case VIR_DOMAIN_TIMER_TRACK_LAST:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (def->timers[i]->tickpolicy) {
|
switch (def->timers[i]->tickpolicy) {
|
||||||
|
@ -554,6 +554,8 @@ qemuValidateDomainDefClockTimers(const virDomainDef *def,
|
|||||||
_("unsupported rtc timer track '%s'"),
|
_("unsupported rtc timer track '%s'"),
|
||||||
virDomainTimerTrackTypeToString(timer->track));
|
virDomainTimerTrackTypeToString(timer->track));
|
||||||
return -1;
|
return -1;
|
||||||
|
case VIR_DOMAIN_TIMER_TRACK_LAST:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (timer->tickpolicy) {
|
switch (timer->tickpolicy) {
|
||||||
|
Loading…
Reference in New Issue
Block a user