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>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4810aa7b82a154c6ad7a28c28b8bb20571988580..d91c0588689c6ac406c5709d891a3eec41355c21 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -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) {

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 2733d12fcd7f7305c6631d7de67b7d606f482c27..36b6757c3ccf9e6806185381c90302352c21fa76 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -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 */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 8ba7121fe8a2d2b765836bc59615259bedb4d36a..372f0888503c4eb592c95bdb2987f1658747cbe6 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -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) {

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index f8f2a0fd3298a5a7265d4b071378b85109f0dcb2..1456a69351f8cd0cfd88d10e9dccc56deaf58df8 100644 (file)
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -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) {