[Xen-changelog] [xen master] hvm/hpet: In hpet_save, correctly compute mc64.

[patchbot@xxxxxxx]

commit f06ffcd4a6ea1b83cd822a9f91a2d7fb47547f34
Author:     Don Slutz <dslutz@xxxxxxxxxxx>
AuthorDate: Fri May 2 16:18:03 2014 -0400
Commit:     Tim Deegan <tim@xxxxxxx>
CommitDate: Thu May 8 12:03:53 2014 +0100

    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 <dslutz@xxxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Tim Deegan <tim@xxxxxxx>
---
 xen/arch/x86/hvm/hpet.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c
index c64c547..0789947 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));
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog