External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDomainTimerDef: Convert 'track' field to proper enum type

Browse Source 
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:
Peter Krempa 2022-10-24 15:08:50 +02:00
parent 7fb8adc7cd
commit 83e1368d95
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/conf/domain_conf.c
View File

@ -10546,7 +10546,6 @@ virDomainTimerDefParseXML(xmlNodePtr node,
VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr catchup;
int ret;
g_autofree char *track = NULL;
g_autofree char *mode = NULL;
ctxt->node = node;
@ -10564,14 +10563,10 @@ virDomainTimerDefParseXML(xmlNodePtr node,
VIR_XML_PROP_NONZERO, &def->tickpolicy) < 0)
return NULL;
track = virXMLPropString(node, "track");
if (track != NULL) {
if ((def->track = virDomainTimerTrackTypeFromString(track)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown timer track '%s'"), track);
return NULL;
}
}
if (virXMLPropEnum(node, "track", virDomainTimerTrackTypeFromString,
VIR_XML_PROP_NONZERO, &def->track) < 0)
return NULL;
ret = virXPathULongLong("string(./@frequency)", ctxt, &def->frequency);
if (ret == -1) {

2
src/conf/domain_conf.h
View File

@ -2479,7 +2479,7 @@ struct _virDomainTimerDef {
virDomainTimerCatchupDef catchup;
/* track is only valid for name='platform|rtc' */
int track; /* enum virDomainTimerTrackType */
virDomainTimerTrackType track;
/* frequency & mode are only valid for name='tsc' */
unsigned long long frequency; /* in Hz, unspecified = 0 */

2
src/qemu/qemu_command.c
View File

@ -5732,6 +5732,8 @@ qemuBuildClockArgStr(virDomainClockDef *def)
case VIR_DOMAIN_TIMER_TRACK_REALTIME:
virBufferAddLit(&buf, ",clock=rt");
break;
case VIR_DOMAIN_TIMER_TRACK_LAST:
break;
}
switch (def->timers[i]->tickpolicy) {

2
src/qemu/qemu_validate.c
View File

@ -554,6 +554,8 @@ qemuValidateDomainDefClockTimers(const virDomainDef *def,
_("unsupported rtc timer track '%s'"),
virDomainTimerTrackTypeToString(timer->track));
return -1;
case VIR_DOMAIN_TIMER_TRACK_LAST:
break;
}
switch (timer->tickpolicy) {