From f06ffcd4a6ea1b83cd822a9f91a2d7fb47547f34 Mon Sep 17 00:00:00 2001 From: Don Slutz Date: Fri, 2 May 2014 16:18:03 -0400 Subject: [PATCH] hvm/hpet: In hpet_save, correctly compute mc64. When the master clock is not enabled, mc64 has the right value. Basicly do the same thing as hpet_read_maincounter(). Signed-off-by: Don Slutz Reviewed-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/hvm/hpet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index c64c5471ac..07899471bd 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -499,7 +499,8 @@ static int hpet_save(struct domain *d, hvm_domain_context_t *h) spin_lock(&hp->lock); /* Write the proper value into the main counter */ - hp->hpet.mc64 = hp->mc_offset + guest_time_hpet(hp); + if ( hpet_enabled(hp) ) + hp->hpet.mc64 = hp->mc_offset + guest_time_hpet(hp); /* Save the HPET registers */ rc = _hvm_init_entry(h, HVM_SAVE_CODE(HPET), 0, HVM_SAVE_LENGTH(HPET)); -- 2.30.2