From: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, mst@redhat.com,
jasowang@redhat.com, quintela@redhat.com, dovgaluk@ispras.ru,
kraxel@redhat.com, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v7 06/14] replay: don't use rtc clock on loadvm phase
Date: Tue, 24 Jan 2017 10:17:30 +0300 [thread overview]
Message-ID: <20170124071730.4572.41874.stgit@PASHA-ISP> (raw)
In-Reply-To: <20170124071654.4572.41407.stgit@PASHA-ISP>
This patch disables the update of the periodic timer of mc146818rtc
in record/replay mode. State of this timer is saved and therefore does
not need to be updated in record/replay mode.
Read of RTC breaks the replay because all rtc reads have to be the same
as in record mode.
Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
---
hw/timer/mc146818rtc.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index da209d0..5638777 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -27,6 +27,7 @@
#include "hw/hw.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
+#include "sysemu/replay.h"
#include "hw/timer/mc146818rtc.h"
#include "qapi/visitor.h"
#include "qapi-event.h"
@@ -734,10 +735,15 @@ static int rtc_post_load(void *opaque, int version_id)
check_update_timer(s);
}
- uint64_t now = qemu_clock_get_ns(rtc_clock);
- if (now < s->next_periodic_time ||
- now > (s->next_periodic_time + get_max_clock_jump())) {
- periodic_timer_update(s, qemu_clock_get_ns(rtc_clock));
+ /* Periodic timer is deterministic in record/replay mode.
+ No need to update it after loading the vmstate.
+ Reading RTC here may break the execution. */
+ if (replay_mode == REPLAY_MODE_NONE) {
+ uint64_t now = qemu_clock_get_ns(rtc_clock);
+ if (now < s->next_periodic_time ||
+ now > (s->next_periodic_time + get_max_clock_jump())) {
+ periodic_timer_update(s, qemu_clock_get_ns(rtc_clock));
+ }
}
#ifdef TARGET_I386
next prev parent reply other threads:[~2017-01-24 7:17 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 7:16 [Qemu-devel] [PATCH v7 00/14] replay additions Pavel Dovgalyuk
2017-01-24 7:17 ` [Qemu-devel] [PATCH v7 01/14] icount: update instruction counter on apic patching Pavel Dovgalyuk
2017-01-24 7:17 ` [Qemu-devel] [PATCH v7 02/14] replay: improve interrupt handling Pavel Dovgalyuk
2017-01-24 7:17 ` [Qemu-devel] [PATCH v7 03/14] replay: exception replay fix Pavel Dovgalyuk
2017-01-25 10:50 ` Paolo Bonzini
2017-01-25 11:12 ` Pavel Dovgalyuk
2017-01-25 11:18 ` Paolo Bonzini
2017-01-25 11:33 ` Pavel Dovgalyuk
2017-01-25 11:56 ` Paolo Bonzini
2017-01-25 12:27 ` Pavel Dovgalyuk
2017-01-25 13:21 ` Paolo Bonzini
2017-01-25 13:26 ` Pavel Dovgalyuk
2017-01-24 7:17 ` [Qemu-devel] [PATCH v7 04/14] icount: exit cpu loop on expire Pavel Dovgalyuk
2017-01-25 11:06 ` Paolo Bonzini
2017-01-25 11:50 ` Pavel Dovgalyuk
2017-01-25 12:00 ` Paolo Bonzini
2017-01-24 7:17 ` [Qemu-devel] [PATCH v7 05/14] apic: save apic_delivered flag Pavel Dovgalyuk
2017-01-25 11:07 ` Paolo Bonzini
2017-01-25 11:52 ` Pavel Dovgalyuk
2017-01-25 11:57 ` Paolo Bonzini
2017-01-25 13:01 ` Pavel Dovgalyuk
2017-01-25 13:14 ` Paolo Bonzini
2017-01-24 7:17 ` Pavel Dovgalyuk [this message]
2017-01-24 7:17 ` [Qemu-devel] [PATCH v7 07/14] integratorcp: adding vmstate for save/restore Pavel Dovgalyuk
2017-01-24 7:17 ` [Qemu-devel] [PATCH v7 08/14] savevm: add public save_vmstate function Pavel Dovgalyuk
2017-01-24 7:17 ` [Qemu-devel] [PATCH v7 09/14] replay: save/load initial state Pavel Dovgalyuk
2017-01-24 7:17 ` [Qemu-devel] [PATCH v7 10/14] block: implement bdrv_snapshot_goto for blkreplay Pavel Dovgalyuk
2017-01-24 7:17 ` [Qemu-devel] [PATCH v7 11/14] blkreplay: create temporary overlay for underlaying devices Pavel Dovgalyuk
2017-01-24 7:18 ` [Qemu-devel] [PATCH v7 12/14] replay: disable default snapshot for record/replay Pavel Dovgalyuk
2017-01-24 7:18 ` [Qemu-devel] [PATCH v7 13/14] audio: make audio poll timer deterministic Pavel Dovgalyuk
2017-01-24 7:18 ` [Qemu-devel] [PATCH v7 14/14] replay: add record/replay for audio passthrough Pavel Dovgalyuk
2017-01-24 7:43 ` [Qemu-devel] [PATCH v7 00/14] replay additions no-reply
2017-01-25 11:12 ` Paolo Bonzini
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=20170124071730.4572.41874.stgit@PASHA-ISP \
--to=pavel.dovgaluk@ispras.ru \
--cc=dovgaluk@ispras.ru \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/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).