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

virDomainTimerDef: Convert 'tickpolicy' field to proper enum type

Browse Source 
Convert the field, adjust the XML parser to use virXMLPropEnum and add
the VIR_DOMAIN_TIMER_TICKPOLICY_LAST enum case to all appropriate
'switch' statements.

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:05:21 +02:00
parent 7fc2c87200
commit 7fb8adc7cd
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/domain_conf.c
View File

@ -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 *tickpolicy = NULL;
g_autofree char *track = NULL; g_autofree char *track = NULL;
g_autofree char *mode = NULL; g_autofree char *mode = NULL;
@ -10561,14 +10560,9 @@ virDomainTimerDefParseXML(xmlNodePtr node,
&def->present) < 0) &def->present) < 0)
return NULL; return NULL;
tickpolicy = virXMLPropString(node, "tickpolicy"); if (virXMLPropEnum(node, "tickpolicy", virDomainTimerTickpolicyTypeFromString,
if (tickpolicy != NULL) { VIR_XML_PROP_NONZERO, &def->tickpolicy) < 0)
if ((def->tickpolicy = virDomainTimerTickpolicyTypeFromString(tickpolicy)) <= 0) { return NULL;
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown timer tickpolicy '%s'"), tickpolicy);
return NULL;
}
}
track = virXMLPropString(node, "track"); track = virXMLPropString(node, "track");
if (track != NULL) { if (track != NULL) {

2
src/conf/domain_conf.h
View File

@ -2474,7 +2474,7 @@ struct _virDomainTimerCatchupDef {
struct _virDomainTimerDef { struct _virDomainTimerDef {
virDomainTimerNameType name; virDomainTimerNameType name;
virTristateBool present; virTristateBool present;
int tickpolicy; /* enum virDomainTimerTickpolicyType */ virDomainTimerTickpolicyType tickpolicy;
virDomainTimerCatchupDef catchup; virDomainTimerCatchupDef catchup;

5
src/qemu/qemu_command.c
View File

@ -5747,6 +5747,8 @@ qemuBuildClockArgStr(virDomainClockDef *def)
case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE: case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE:
case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD: case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD:
return NULL; return NULL;
case VIR_DOMAIN_TIMER_TICKPOLICY_LAST:
break;
} }
break; /* no need to check other timers - there is only one rtc */ break; /* no need to check other timers - there is only one rtc */
} }
@ -5818,6 +5820,8 @@ qemuBuildClockCommandLine(virCommand *cmd,
case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE: case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE:
/* no way to support this mode for pit in qemu */ /* no way to support this mode for pit in qemu */
return -1; return -1;
case VIR_DOMAIN_TIMER_TICKPOLICY_LAST:
break;
} }
break; break;
@ -6201,6 +6205,7 @@ qemuBuildCpuCommandLine(virCommand *cmd,
case VIR_DOMAIN_TIMER_TICKPOLICY_NONE: case VIR_DOMAIN_TIMER_TICKPOLICY_NONE:
case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP:
case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE: case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE:
case VIR_DOMAIN_TIMER_TICKPOLICY_LAST:
break; break;
} }
break; break;

6
src/qemu/qemu_validate.c
View File

@ -572,6 +572,8 @@ qemuValidateDomainDefClockTimers(const virDomainDef *def,
virDomainTimerTickpolicyTypeToString( virDomainTimerTickpolicyTypeToString(
timer->tickpolicy)); timer->tickpolicy));
return -1; return -1;
case VIR_DOMAIN_TIMER_TICKPOLICY_LAST:
break;
} }
break; break;
@ -598,6 +600,8 @@ qemuValidateDomainDefClockTimers(const virDomainDef *def,
virDomainTimerTickpolicyTypeToString( virDomainTimerTickpolicyTypeToString(
timer->tickpolicy)); timer->tickpolicy));
return -1; return -1;
case VIR_DOMAIN_TIMER_TICKPOLICY_LAST:
break;
} }
break; break;
@ -650,6 +654,8 @@ qemuValidateDomainDefClockTimers(const virDomainDef *def,
virDomainTimerNameTypeToString(timer->name), virDomainTimerNameTypeToString(timer->name),
virDomainTimerTickpolicyTypeToString(timer->tickpolicy)); virDomainTimerTickpolicyTypeToString(timer->tickpolicy));
return -1; return -1;
case VIR_DOMAIN_TIMER_TICKPOLICY_LAST:
break;
} }
break; break;
} }