From patchwork Mon Mar 2 10:08:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 445017 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CB9D714018C for ; Mon, 2 Mar 2015 21:12:16 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=MaJZynv1; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:55955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSNKg-0005yG-Tr for incoming@patchwork.ozlabs.org; Mon, 02 Mar 2015 05:12:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSNHh-0001XE-EF for qemu-devel@nongnu.org; Mon, 02 Mar 2015 05:09:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSNHf-0007kc-Ve for qemu-devel@nongnu.org; Mon, 02 Mar 2015 05:09:09 -0500 Received: from mail-we0-x230.google.com ([2a00:1450:400c:c03::230]:36161) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSNHf-0007kV-PE for qemu-devel@nongnu.org; Mon, 02 Mar 2015 05:09:07 -0500 Received: by wevk48 with SMTP id k48so32220425wev.3 for ; Mon, 02 Mar 2015 02:09:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=jlaDqchDnTruJhUtOMhYpZGn3pFjdyBIybQzROnuifE=; b=MaJZynv1p7rBISEFoxs/BUoLfbDcUA3daysWKCqJO55143n2D/wrWw8HZDqO8I4B59 Fbr7pOt7cTvt+73pjlCgAbFKFKq8hm9pg1wl0C6896tvny0hN7spJeGiLUl/pRvSh1wE kaNmTxcyEjAbmEEN9i+uD65F8dJgoLfQcwEHekkIVKG/kFHleS0MTznX9GtCXlRxVsWI kTtA19D/5WvCOwJ7EfEH2+RFf5VxQcWVQtyHfbnqDrkthw8uM1YeT3gsKK5IzpD8SDPC FakE60Y4KaKjoEJdSAb5oAMkfZfzVSLK9bvqwDLgSFasdYr0LtBLSfElglKykQlhXG0H w5cA== X-Received: by 10.195.12.97 with SMTP id ep1mr58146763wjd.134.1425290947302; Mon, 02 Mar 2015 02:09:07 -0800 (PST) Received: from localhost.localdomain (net-37-116-207-136.cust.vodafonedsl.it. [37.116.207.136]) by mx.google.com with ESMTPSA id g10sm15364685wic.7.2015.03.02.02.09.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Mar 2015 02:09:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 2 Mar 2015 11:08:43 +0100 Message-Id: <1425290934-60872-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1425290934-60872-1-git-send-email-pbonzini@redhat.com> References: <1425290934-60872-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::230 Cc: Pavel Dovgalyuk Subject: [Qemu-devel] [PULL 04/15] timer: replace time() with QEMU_CLOCK_HOST X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Pavel Dovgalyuk This patch replaces time() function calls with calls to qemu_clock_get_ns(QEMU_CLOCK_HOST). It makes such requests deterministic in record/replay mode of icount. Reviewed-by: Paolo Bonzini Signed-off-by: Pavel Dovgalyuk Message-Id: <20150227131102.11912.89850.stgit@PASHA-ISP> Signed-off-by: Paolo Bonzini --- vl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index e1ffd0a..9213f68 100644 --- a/vl.c +++ b/vl.c @@ -710,13 +710,17 @@ void vm_start(void) /***********************************************************/ /* real time host monotonic timer */ +static time_t qemu_time(void) +{ + return qemu_clock_get_ms(QEMU_CLOCK_HOST) / 1000; +} + /***********************************************************/ /* host time/date access */ void qemu_get_timedate(struct tm *tm, int offset) { - time_t ti; + time_t ti = qemu_time(); - time(&ti); ti += offset; if (rtc_date_offset == -1) { if (rtc_utc) @@ -744,7 +748,7 @@ int qemu_timedate_diff(struct tm *tm) else seconds = mktimegm(tm) + rtc_date_offset; - return seconds - time(NULL); + return seconds - qemu_time(); } static void configure_rtc_date_offset(const char *startdate, int legacy) @@ -782,7 +786,7 @@ static void configure_rtc_date_offset(const char *startdate, int legacy) "'2006-06-17T16:01:21' or '2006-06-17'\n"); exit(1); } - rtc_date_offset = time(NULL) - rtc_start_date; + rtc_date_offset = qemu_time() - rtc_start_date; } }