From patchwork Thu Sep 15 09:01:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 9332981 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 289D26077F for ; Thu, 15 Sep 2016 09:06:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14A6D2943B for ; Thu, 15 Sep 2016 09:06:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0934B2943E; Thu, 15 Sep 2016 09:06:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C71462943B for ; Thu, 15 Sep 2016 09:06:23 +0000 (UTC) Received: from localhost ([::1]:32853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkScg-0001I8-VK for patchwork-qemu-devel@patchwork.kernel.org; Thu, 15 Sep 2016 05:06:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkSY2-0006Mo-Um for qemu-devel@nongnu.org; Thu, 15 Sep 2016 05:01:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkSXz-0001su-2R for qemu-devel@nongnu.org; Thu, 15 Sep 2016 05:01:34 -0400 Received: from mail.ispras.ru ([83.149.199.45]:38990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkSXy-0001ri-M6 for qemu-devel@nongnu.org; Thu, 15 Sep 2016 05:01:30 -0400 Received: from [10.10.150.35] (unknown [85.142.117.224]) by mail.ispras.ru (Postfix) with ESMTPSA id 08C2E540071; Thu, 15 Sep 2016 12:01:22 +0300 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Thu, 15 Sep 2016 12:01:16 +0300 Message-ID: <20160915090116.6440.46288.stgit@PASHA-ISP> In-Reply-To: <20160915090042.6440.22516.stgit@PASHA-ISP> References: <20160915090042.6440.22516.stgit@PASHA-ISP> User-Agent: StGit/0.16 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [PATCH v2 06/10] replay: vmstate for replay module X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, quintela@redhat.com, jasowang@redhat.com, mst@redhat.com, agraf@suse.de, pbonzini@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch introduces vmstate for replay data structures. It allows saving and loading vmstate while replaying. Signed-off-by: Pavel Dovgalyuk --- include/sysemu/replay.h | 4 ++++ replay/replay-internal.h | 2 ++ replay/replay-snapshot.c | 40 ++++++++++++++++++++++++++++++++++++++++ vl.c | 1 + 4 files changed, 47 insertions(+) diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index aa378ce..1123fc2 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -147,6 +147,10 @@ void replay_net_packet_event(ReplayNetState *rns, unsigned flags, /* VM state operations */ +/* Registers replay VMState. + Should be called before virtual devices initialization + to make cached timers available for post_load functions. */ +void replay_vmstate_register(void); /*! Called at the start of execution. Loads or saves initial vmstate depending on execution mode. */ void replay_vmstate_init(void); diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 3147d66..9bc4a29 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; diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c index a48c6fc..4933bdd 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/vl.c b/vl.c index 6698d88..f2193cb 100644 --- a/vl.c +++ b/vl.c @@ -4361,6 +4361,7 @@ int main(int argc, char **argv, char **envp) configure_icount(icount_opts, &error_abort); qemu_opts_del(icount_opts); } + replay_vmstate_register(); if (default_net) { QemuOptsList *net = qemu_find_opts("net");