From 5cc2d8f6d5a8c4153c6ade94c79f3c986963f3e3 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Sat, 28 Nov 2015 07:18:29 +0100 Subject: [PATCH] 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 --- src/xenconfig/xen_common.c | 2 ++ src/xenconfig/xen_sxpr.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 0890c73b8d..ed6978ffa4 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 f9a3187f97..09989acc30 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; -- GitLab