From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmKDY-0004nK-BE for qemu-devel@nongnu.org; Tue, 20 Sep 2016 08:32:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmKDW-0000ug-AO for qemu-devel@nongnu.org; Tue, 20 Sep 2016 08:32:07 -0400 Received: from mail.ispras.ru ([83.149.199.45]:57854) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmKDW-0000qn-2u for qemu-devel@nongnu.org; Tue, 20 Sep 2016 08:32:06 -0400 From: Pavel Dovgalyuk Date: Tue, 20 Sep 2016 15:32:01 +0300 Message-ID: <20160920123200.5400.58122.stgit@PASHA-ISP.def.inno> In-Reply-To: <20160920123126.5400.29283.stgit@PASHA-ISP.def.inno> References: <20160920123126.5400.29283.stgit@PASHA-ISP.def.inno> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v3 6/8] replay: vmstate for replay module List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jasowang@redhat.com, quintela@redhat.com, pbonzini@redhat.com, mst@redhat.com This patch introduces vmstate for replay data structures. It allows saving and loading vmstate while replaying. Signed-off-by: Pavel Dovgalyuk --- replay/replay-internal.h | 9 +++++++++ replay/replay-snapshot.c | 40 ++++++++++++++++++++++++++++++++++++++++ replay/replay.c | 1 + 3 files changed, 50 insertions(+) diff --git a/replay/replay-internal.h b/replay/replay-internal.h index b586f88..726e3d5 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -67,6 +67,8 @@ typedef struct ReplayState { unsigned int data_kind; /*! Flag which indicates that event is not processed yet. */ unsigned int has_unread_data; + /*! Temporary variable for saving current log offset. */ + uint64_t file_offset; } ReplayState; extern ReplayState replay_state; @@ -170,4 +172,11 @@ void replay_event_net_save(void *opaque); /*! Reads network from the file. */ void *replay_event_net_load(void); +/* VMState-related functions */ + +/* Registers replay VMState. + Should be called before virtual devices initialization + to make cached timers available for post_load functions. */ +void replay_vmstate_register(void); + #endif diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c index 6079b29..708e4bf 100644 --- a/replay/replay-snapshot.c +++ b/replay/replay-snapshot.c @@ -17,6 +17,46 @@ #include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "qapi/qmp/qstring.h" +#include "migration/vmstate.h" + +static void replay_pre_save(void *opaque) +{ + ReplayState *state = opaque; + state->file_offset = ftello64(replay_file); +} + +static int replay_post_load(void *opaque, int version_id) +{ + ReplayState *state = opaque; + fseeko64(replay_file, state->file_offset, SEEK_SET); + /* If this was a vmstate, saved in recording mode, + we need to initialize replay data fields. */ + replay_fetch_data_kind(); + + return 0; +} + +static const VMStateDescription vmstate_replay = { + .name = "replay", + .version_id = 1, + .minimum_version_id = 1, + .pre_save = replay_pre_save, + .post_load = replay_post_load, + .fields = (VMStateField[]) { + VMSTATE_INT64_ARRAY(cached_clock, ReplayState, REPLAY_CLOCK_COUNT), + VMSTATE_UINT64(current_step, ReplayState), + VMSTATE_INT32(instructions_count, ReplayState), + VMSTATE_UINT32(data_kind, ReplayState), + VMSTATE_UINT32(has_unread_data, ReplayState), + VMSTATE_UINT64(file_offset, ReplayState), + VMSTATE_END_OF_LIST() + }, +}; + +void replay_vmstate_register(void) +{ + vmstate_register(NULL, 0, &vmstate_replay, &replay_state); +} void replay_vmstate_init(void) { diff --git a/replay/replay.c b/replay/replay.c index c357be5..e679f0d 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -295,6 +295,7 @@ void replay_configure(QemuOpts *opts) replay_snapshot = g_strdup(qemu_opt_get(opts, "rrsnapshot")); + replay_vmstate_register(); replay_enable(fname, mode); out: