From patchwork Thu Jan 17 07:37:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 10767631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 03F556C5 for ; Thu, 17 Jan 2019 07:41:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7A432F2CA for ; Thu, 17 Jan 2019 07:41:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DB4592F42D; Thu, 17 Jan 2019 07:41:15 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 58AAD2F2CA for ; Thu, 17 Jan 2019 07:41:15 +0000 (UTC) Received: from localhost ([127.0.0.1]:37928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk2Ic-0000d2-Kj for patchwork-qemu-devel@patchwork.kernel.org; Thu, 17 Jan 2019 02:41:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk2FF-000656-Kb for qemu-devel@nongnu.org; Thu, 17 Jan 2019 02:37:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gk2FE-0002v2-Nn for qemu-devel@nongnu.org; Thu, 17 Jan 2019 02:37:45 -0500 Received: from mail.ispras.ru ([83.149.199.45]:57704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk2FE-0002uE-Ci for qemu-devel@nongnu.org; Thu, 17 Jan 2019 02:37:44 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 7EEED540081; Thu, 17 Jan 2019 10:37:43 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Thu, 17 Jan 2019 10:37:47 +0300 Message-ID: <20190117073747.5399.79626.stgit@pasha-VirtualBox> In-Reply-To: <20190117073649.5399.97670.stgit@pasha-VirtualBox> References: <20190117073649.5399.97670.stgit@pasha-VirtualBox> User-Agent: StGit/0.17.1-dirty 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 v10 10/24] qapi: introduce replay.json for record/replay-related stuff 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: kwolf@redhat.com, peter.maydell@linaro.org, war2jordan@live.com, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, crosthwaite.peter@gmail.com, ciro.santilli@gmail.com, jasowang@redhat.com, quintela@redhat.com, armbru@redhat.com, mreitz@redhat.com, alex.bennee@linaro.org, maria.klimushenkova@ispras.ru, mst@redhat.com, kraxel@redhat.com, boost.lists@gmail.com, thomas.dullien@googlemail.com, dovgaluk@ispras.ru, artem.k.pisarenko@gmail.com, dgilbert@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch adds replay.json file. It will be used for adding record/replay-related data structures and commands. Signed-off-by: Pavel Dovgalyuk Reviewed-by: Markus Armbruster --- v10: - minor changes --- MAINTAINERS | 1 + Makefile.objs | 4 ++-- include/sysemu/replay.h | 2 +- qapi/misc.json | 18 ------------------ qapi/qapi-schema.json | 1 + qapi/replay.json | 26 ++++++++++++++++++++++++++ 6 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 qapi/replay.json diff --git a/MAINTAINERS b/MAINTAINERS index af339b8..3bfa333 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2138,6 +2138,7 @@ F: net/filter-replay.c F: include/sysemu/replay.h F: docs/replay.txt F: stubs/replay.c +F: qapi/replay.json IOVA Tree M: Peter Xu diff --git a/Makefile.objs b/Makefile.objs index 4561159..8164b22 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,6 +1,6 @@ QAPI_MODULES = block-core block char common crypto introspect job migration -QAPI_MODULES += misc net rdma rocker run-state sockets tpm trace transaction -QAPI_MODULES += ui +QAPI_MODULES += misc net rdma replay rocker run-state sockets tpm trace +QAPI_MODULES += transaction ui ####################################################################### # Common libraries for tools and emulators diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index b3f593f..3fe14b5 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -13,7 +13,7 @@ */ #include "sysemu.h" -#include "qapi/qapi-types-misc.h" +#include "qapi/qapi-types-replay.h" #include "qapi/qapi-types-ui.h" /* replay clock kinds */ diff --git a/qapi/misc.json b/qapi/misc.json index 24d20a8..e5e0bea 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -3125,24 +3125,6 @@ 'data': { 'offset': 'int' } } ## -# @ReplayMode: -# -# Mode of the replay subsystem. -# -# @none: normal execution mode. Replay or record are not enabled. -# -# @record: record mode. All non-deterministic data is written into the -# replay log. -# -# @play: replay mode. Non-deterministic data required for system execution -# is read from the log. -# -# Since: 2.5 -## -{ 'enum': 'ReplayMode', - 'data': [ 'none', 'record', 'play' ] } - -## # @xen-load-devices-state: # # Load the state of all devices from file. The RAM and the block devices diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 3bbdfce..6d3fa9f 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -94,4 +94,5 @@ { 'include': 'transaction.json' } { 'include': 'trace.json' } { 'include': 'introspect.json' } +{ 'include': 'replay.json' } { 'include': 'misc.json' } diff --git a/qapi/replay.json b/qapi/replay.json new file mode 100644 index 0000000..9e13551 --- /dev/null +++ b/qapi/replay.json @@ -0,0 +1,26 @@ +# -*- Mode: Python -*- +# + +## +# = Record/replay +## + +{ 'include': 'common.json' } + +## +# @ReplayMode: +# +# Mode of the replay subsystem. +# +# @none: normal execution mode. Replay or record are not enabled. +# +# @record: record mode. All non-deterministic data is written into the +# replay log. +# +# @play: replay mode. Non-deterministic data required for system execution +# is read from the log. +# +# Since: 2.5 +## +{ 'enum': 'ReplayMode', + 'data': [ 'none', 'record', 'play' ] }