Merge commit 'c9159fe9aa9abe24115ea4d16127179e9cb07e22' into upstream-merge

* commit 'c9159fe9aa9abe24115ea4d16127179e9cb07e22': (83 commits)
  Remove libhw
  rtc: implement century byte
  rtc: map CMOS index 0x37 to 0x32 on read and writes
  rtc: fix overflow in mktimegm
  qtest: implement QTEST_STOP
  qemu-barrier: Fix compiler version check for future gcc versions
  doc: update HACKING wrt strncpy/pstrcpy
  hw/r2d: add comment: this strncpy use is ok
  qcow2: mark this file's sole strncpy use as justified
  acpi: remove strzcpy (strncpy-identical) function; just use strncpy
  libcacard/vcard_emul_nss: use pstrcpy in place of strncpy
  qemu-ga: prefer pstrcpy: consistently NUL-terminate ifreq.ifr_name
  vscsi: avoid unwarranted strncpy
  virtio-9p: avoid unwarranted uses of strncpy
  bt: replace fragile snprintf use and unwarranted strncpy
  ui/vnc: simplify and avoid strncpy
  linux-user: remove two unchecked uses of strdup
  ppc: avoid buffer overrun: use pstrcpy, not strncpy
  os-posix: avoid buffer overrun
  lm32: avoid buffer overrun
  ...

Conflicts:
	hw/Makefile.objs

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/cutils.c b/cutils.c
index 8ef648f4b..8edd8fa13 100644
--- a/cutils.c
+++ b/cutils.c
@@ -115,7 +115,7 @@ time_t mktimegm(struct tm *tm)
         m += 12;
         y--;
     }
-    t = 86400 * (d + (153 * m - 457) / 5 + 365 * y + y / 4 - y / 100 + 
+    t = 86400ULL * (d + (153 * m - 457) / 5 + 365 * y + y / 4 - y / 100 + 
                  y / 400 - 719469);
     t += 3600 * tm->tm_hour + 60 * tm->tm_min + tm->tm_sec;
     return t;