[Xen-changelog] [xen master] hvm/hpet: Detect comparator values in the past

[patchbot@xxxxxxx]

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

    hvm/hpet: Detect comparator values in the past
    
    This statement only works using 64-bit arithmetic for the main
                                         63
    counter never changing by more then 2  .  (Which is a boundary
    case that should not happen in my life time.)
    
    Signed-off-by: Don Slutz <dslutz@xxxxxxxxxxx>
    Acked-by: Tim Deegan <tim@xxxxxxx>
---
 xen/arch/x86/hvm/hpet.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c
index 2a99fed..167994e 100644
--- a/xen/arch/x86/hvm/hpet.c
+++ b/xen/arch/x86/hvm/hpet.c
@@ -98,10 +98,12 @@ static uint64_t hpet_get_comparator(HPETState *h, unsigned 
int tn,
         uint64_t period = h->hpet.period[tn];
         if (period)
         {
-            elapsed = hpet_read_maincounter(h, guest_time) +
-                period - comparator;
-            comparator += (elapsed / period) * period;
-            h->hpet.comparator64[tn] = comparator;
+            elapsed = hpet_read_maincounter(h, guest_time) - comparator;
+            if ( (int64_t)elapsed >= 0 )
+            {
+                comparator += ((elapsed + period) / period) * period;
+                h->hpet.comparator64[tn] = comparator;
+            }
         }
     }
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

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