From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Subject: [Qemu-devel] [PULL 04/15] timer: replace time() with QEMU_CLOCK_HOST
Date: Mon, 2 Mar 2015 11:08:43 +0100 [thread overview]
Message-ID: <1425290934-60872-5-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1425290934-60872-1-git-send-email-pbonzini@redhat.com>
From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
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 <pbonzini@redhat.com>
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Message-Id: <20150227131102.11912.89850.stgit@PASHA-ISP>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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;
}
}
--
2.3.0
next prev parent reply other threads:[~2015-03-02 10:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-02 10:08 [Qemu-devel] [PULL 00/15] Misc changes for 2015-03-02 Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 01/15] scsi: give device a parent before setting properties Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 02/15] block: Forbid bdrv_set_aio_context outside BQL Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 03/15] virtio-scsi-dataplane: Call blk_set_aio_context within BQL Paolo Bonzini
2015-03-02 10:08 ` Paolo Bonzini [this message]
2015-03-02 10:08 ` [Qemu-devel] [PULL 05/15] bootdevice: fix segment fault when booting guest with '-kernel' and '-initrd' Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 06/15] Add specific config options for PCI-E bridges Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 07/15] Create specific config option for "platform-bus" Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 08/15] Give ivshmem its own config option Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 09/15] iscsi: Handle write protected case in reopen Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 10/15] Makefile: fix up parallel building under MSYS+MinGW Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 11/15] Makefile: don't silence mak file test with V=1 Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 12/15] Makefile.target: binary depends on config-devices Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 13/15] virtio-scsi: Allocate op blocker reason before blocking Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 14/15] cpus: fix deadlock and segfault in qemu_mutex_lock_iothread Paolo Bonzini
2015-03-02 10:08 ` [Qemu-devel] [PULL 15/15] cpus: be more paranoid in avoiding deadlocks Paolo Bonzini
2015-03-02 16:09 ` [Qemu-devel] [PULL 00/15] Misc changes for 2015-03-02 Eric Blake
2015-03-02 16:23 ` Paolo Bonzini
2015-03-02 17:15 ` Eric Blake
2015-03-03 13:09 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425290934-60872-5-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=Pavel.Dovgaluk@ispras.ru \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).