From: Pavel Hrdina <phrdina@redhat.com>
Date: Sat, 28 Nov 2015 06:18:29 +0000 (+0100)
Subject: xen: fix timer bug found by updated test
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5cc2d8f6d5a8c4153c6ade94c79f3c986963f3e3;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

xen: fix timer bug found by updated test

Only 'tsc' timer allows set mode and track is valid only for 'rtc' and
'platform' timers.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 0890c73b8..ed6978ffa 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -553,6 +553,8 @@ xenParseCPUFeatures(virConfPtr conf, virDomainDefPtr def)
             timer->name = VIR_DOMAIN_TIMER_NAME_HPET;
             timer->present = val;
             timer->tickpolicy = -1;
+            timer->mode = -1;
+            timer->track = -1;
 
             def->clock.ntimers = 1;
             def->clock.timers[0] = timer;
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index f9a3187f9..09989acc3 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -1262,6 +1262,8 @@ xenParseSxpr(const struct sexpr *root,
             timer->name = VIR_DOMAIN_TIMER_NAME_HPET;
             timer->present = sexpr_int(root, "domain/image/hvm/hpet");
             timer->tickpolicy = -1;
+            timer->mode = -1;
+            timer->track = -1;
 
             def->clock.ntimers = 1;
             def->clock.timers[0] = timer;