From f54c556c08c57a317ad54f5d2d9ad549b931cda2 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Sun, 6 Nov 2011 18:00:22 +0200 Subject: [PATCH] qemu_timedate_diff() shouldn't modify its argument. The caller of qemu_timedate_diff() does not expect that tm it passes to the function will be modified, but mktime() is destructive and modifies its argument. Pass a copy of tm to it and set tm_isdst so that mktime() will not rely on it since its value may be outdated. Signed-off-by: Gleb Natapov Signed-off-by: Anthony Liguori --- vl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 624da0fd3c..641629b1ce 100644 --- a/vl.c +++ b/vl.c @@ -460,8 +460,11 @@ int qemu_timedate_diff(struct tm *tm) if (rtc_date_offset == -1) if (rtc_utc) seconds = mktimegm(tm); - else - seconds = mktime(tm); + else { + struct tm tmp = *tm; + tmp.tm_isdst = -1; /* use timezone to figure it out */ + seconds = mktime(&tmp); + } else seconds = mktimegm(tm) + rtc_date_offset; -- 2.11.4.GIT