[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 4/9] replay: don't use rtc clock on loadvm phase
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v6 4/9] replay: don't use rtc clock on loadvm phase |
Date: |
Mon, 19 Dec 2016 16:21:28 +0300 |
User-agent: |
StGit/0.16 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH v6 0/9] replay additions, Pavel Dovgalyuk, 2016/12/19
- [Qemu-devel] [PATCH v6 1/9] icount: update instruction counter on apic patching, Pavel Dovgalyuk, 2016/12/19
- [Qemu-devel] [PATCH v6 2/9] replay: improve interrupt handling, Pavel Dovgalyuk, 2016/12/19
- [Qemu-devel] [PATCH v6 3/9] apic: save apic_delivered flag, Pavel Dovgalyuk, 2016/12/19
- [Qemu-devel] [PATCH v6 4/9] replay: don't use rtc clock on loadvm phase,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v6 5/9] integratorcp: adding vmstate for save/restore, Pavel Dovgalyuk, 2016/12/19
- [Qemu-devel] [PATCH v6 6/9] savevm: add public save_vmstate function, Pavel Dovgalyuk, 2016/12/19
- [Qemu-devel] [PATCH v6 7/9] replay: save/load initial state, Pavel Dovgalyuk, 2016/12/19
- [Qemu-devel] [PATCH v6 8/9] block: implement bdrv_snapshot_goto for blkreplay, Pavel Dovgalyuk, 2016/12/19
- [Qemu-devel] [PATCH v6 9/9] blkreplay: create temporary overlay for underlaying devices, Pavel Dovgalyuk, 2016/12/19