[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 09/10] replay: save prior value of the host clock
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v9 09/10] replay: save prior value of the host clock |
Date: |
Thu, 04 May 2017 11:42:27 +0300 |
User-agent: |
StGit/0.16 |
From: Pavel Dovgalyuk <address@hidden>
This patch adds saving/restoring of the host clock field 'last'.
It is used in host clock calculation and therefore clock may
become incorrect when using restored vmstate.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
include/qemu/timer.h | 14 ++++++++++++++
replay/replay-internal.h | 2 ++
replay/replay-snapshot.c | 3 +++
util/qemu-timer.c | 12 ++++++++++++
4 files changed, 31 insertions(+)
diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 8a1eb74839..5e9adbbf01 100644
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -251,6 +251,20 @@ bool qemu_clock_run_timers(QEMUClockType type);
*/
bool qemu_clock_run_all_timers(void);
+/**
+ * qemu_clock_get_last:
+ *
+ * Returns last clock query time.
+ */
+uint64_t qemu_clock_get_last(QEMUClockType type);
+/**
+ * qemu_clock_set_last:
+ *
+ * Sets last clock query time.
+ */
+void qemu_clock_set_last(QEMUClockType type, uint64_t last);
+
+
/*
* QEMUTimerList
*/
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index ed66ed803c..738983e76a 100644
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -77,6 +77,8 @@ typedef struct ReplayState {
This counter is global, because requests from different
block devices should not get overlapping ids. */
uint64_t block_request_id;
+ /*! Prior value of the host clock */
+ uint64_t host_clock_last;
} ReplayState;
extern ReplayState replay_state;
diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c
index 438d82ec33..1a0b76b9ca 100644
--- a/replay/replay-snapshot.c
+++ b/replay/replay-snapshot.c
@@ -24,12 +24,14 @@ static void replay_pre_save(void *opaque)
{
ReplayState *state = opaque;
state->file_offset = ftell(replay_file);
+ state->host_clock_last = qemu_clock_get_last(QEMU_CLOCK_HOST);
}
static int replay_post_load(void *opaque, int version_id)
{
ReplayState *state = opaque;
fseek(replay_file, state->file_offset, SEEK_SET);
+ qemu_clock_set_last(QEMU_CLOCK_HOST, state->host_clock_last);
/* If this was a vmstate, saved in recording mode,
we need to initialize replay data fields. */
replay_fetch_data_kind();
@@ -51,6 +53,7 @@ static const VMStateDescription vmstate_replay = {
VMSTATE_UINT32(has_unread_data, ReplayState),
VMSTATE_UINT64(file_offset, ReplayState),
VMSTATE_UINT64(block_request_id, ReplayState),
+ VMSTATE_UINT64(host_clock_last, ReplayState),
VMSTATE_END_OF_LIST()
},
};
diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index 82d56507a2..2ed1bf2778 100644
--- a/util/qemu-timer.c
+++ b/util/qemu-timer.c
@@ -622,6 +622,18 @@ int64_t qemu_clock_get_ns(QEMUClockType type)
}
}
+uint64_t qemu_clock_get_last(QEMUClockType type)
+{
+ QEMUClock *clock = qemu_clock_ptr(type);
+ return clock->last;
+}
+
+void qemu_clock_set_last(QEMUClockType type, uint64_t last)
+{
+ QEMUClock *clock = qemu_clock_ptr(type);
+ clock->last = last;
+}
+
void qemu_clock_register_reset_notifier(QEMUClockType type,
Notifier *notifier)
{
- Re: [Qemu-devel] [PATCH v9 06/10] replay: fix save/load vm for non-empty queue, (continued)
- Re: [Qemu-devel] [PATCH v9 06/10] replay: fix save/load vm for non-empty queue, Paolo Bonzini, 2017/05/04
- Re: [Qemu-devel] [PATCH v9 06/10] replay: fix save/load vm for non-empty queue, Pavel Dovgalyuk, 2017/05/04
- Re: [Qemu-devel] [PATCH v9 06/10] replay: fix save/load vm for non-empty queue, Paolo Bonzini, 2017/05/04
- Re: [Qemu-devel] [PATCH v9 06/10] replay: fix save/load vm for non-empty queue, Pavel Dovgalyuk, 2017/05/04
- Re: [Qemu-devel] [PATCH v9 06/10] replay: fix save/load vm for non-empty queue, Paolo Bonzini, 2017/05/04
- Re: [Qemu-devel] [PATCH v9 06/10] replay: fix save/load vm for non-empty queue, Pavel Dovgalyuk, 2017/05/04
- Re: [Qemu-devel] [PATCH v9 06/10] replay: fix save/load vm for non-empty queue, Paolo Bonzini, 2017/05/04
- Re: [Qemu-devel] [PATCH v9 06/10] replay: fix save/load vm for non-empty queue, Pavel Dovgalyuk, 2017/05/04
[Qemu-devel] [PATCH v9 07/10] replay: added replay log format description, Pavel Dovgalyuk, 2017/05/04
[Qemu-devel] [PATCH v9 08/10] replay: make safe vmstop at record/replay, Pavel Dovgalyuk, 2017/05/04
[Qemu-devel] [PATCH v9 09/10] replay: save prior value of the host clock,
Pavel Dovgalyuk <=
[Qemu-devel] [PATCH v9 10/10] icount: fixed saving/restoring of icount warp timers, Pavel Dovgalyuk, 2017/05/04
Re: [Qemu-devel] [PATCH v9 00/10] replay additions, no-reply, 2017/05/04