X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=virt-top%2Fvirt_top_calendar1.ml;h=534465c51ffb82c451a64a167a80d880625a62bb;hp=beac4eed1d130d49f62295670c7d9e2eb0211636;hb=49c5f041be5d1482ab497ed91b1c71e054d7e49d;hpb=2a8acd07005f2e8cdc43a6cc2a4e6f3d66f9fc4d

diff --git a/virt-top/virt_top_calendar1.ml b/virt-top/virt_top_calendar1.ml
index beac4ee..534465c 100755
--- a/virt-top/virt_top_calendar1.ml
+++ b/virt-top/virt_top_calendar1.ml
@@ -49,5 +49,8 @@ fun time ->
 
   eprintf "end time: %s\n" (Printer.CalendarPrinter.to_string cal);
 
-  (* Convert to a time_t, adjusting for the current timezone. *)
-  fst (Unix.mktime (Calendar.to_unixtm cal))
+  (* Convert to a time_t.  Note that we compare this against
+   * Unix.gettimeofday in the main module, so this must be returned as
+   * plain seconds from 1970 with no timezone adjustment.  (RHBZ#637964)
+   *)
+  Calendar.to_unixfloat cal