From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:53260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gixex-0002VN-0P for qemu-devel@nongnu.org; Mon, 14 Jan 2019 03:31:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gixev-0003Fu-UR for qemu-devel@nongnu.org; Mon, 14 Jan 2019 03:31:51 -0500 Received: from mail.ispras.ru ([83.149.199.45]:54456) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gixev-0003EO-Jn for qemu-devel@nongnu.org; Mon, 14 Jan 2019 03:31:49 -0500 From: "Pavel Dovgalyuk" References: <154703587757.13472.3898702635363120794.stgit@pasha-VirtualBox> <154703593746.13472.3886549854409661470.stgit@pasha-VirtualBox> <877efciyxr.fsf@dusky.pond.sub.org> In-Reply-To: <877efciyxr.fsf@dusky.pond.sub.org> Date: Mon, 14 Jan 2019 11:31:47 +0300 Message-ID: <000a01d4abe3$9744ee70$c5cecb50$@ru> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Language: ru Subject: Re: [Qemu-devel] [PATCH v9 10/21] qapi: introduce replay.json for record/replay-related stuff List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: 'Markus Armbruster' , 'Pavel Dovgalyuk' Cc: qemu-devel@nongnu.org, kwolf@redhat.com, peter.maydell@linaro.org, war2jordan@live.com, pbonzini@redhat.com, crosthwaite.peter@gmail.com, ciro.santilli@gmail.com, jasowang@redhat.com, quintela@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, artem.k.pisarenko@gmail.com, dgilbert@redhat.com, rth@twiddle.net > From: Markus Armbruster [mailto:armbru@redhat.com] > Pavel Dovgalyuk writes: > > > This patch adds replay.json file. It will be > > used for adding record/replay-related data structures and commands. > > > > Signed-off-by: Pavel Dovgalyuk > > --- > > MAINTAINERS | 1 + > > Makefile.objs | 4 ++-- > > include/sysemu/replay.h | 1 + > > qapi/misc.json | 18 ------------------ > > qapi/qapi-schema.json | 1 + > > qapi/replay.json | 26 ++++++++++++++++++++++++++ > > 6 files changed, 31 insertions(+), 20 deletions(-) > > create mode 100644 qapi/replay.json > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 0bfd95a..7b0a1bc 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -2122,6 +2122,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..2054296 100644 > > --- a/include/sysemu/replay.h > > +++ b/include/sysemu/replay.h > > @@ -13,6 +13,7 @@ > > */ > > > > #include "sysemu.h" > > +#include "qapi/qapi-types-replay.h" > > #include "qapi/qapi-types-misc.h" > > I believe you can drop qapi/qapi-types-misc.h now. Missed this one, thanks. > > > #include "qapi/qapi-types-ui.h" > > > > 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..b85fd04 100644 > > --- a/qapi/qapi-schema.json > > +++ b/qapi/qapi-schema.json > > @@ -95,3 +95,4 @@ > # Documentation generated with qapi-gen.py is in source order, with > # included sub-schemas inserted at the first include directive > # (subsequent include directives have no effect). To get a sane and > # stable order, it's best to include each sub-schema just once, or > # include it first right here. > [...] > > { 'include': 'trace.json' } > > { 'include': 'introspect.json' } > > { 'include': 'misc.json' } > > +{ 'include': 'replay.json' } > > I doubt this the best spot for replay stuff in the generated > documentation. > > Is there another chapter you'd consider related? Do you mean, that replay should be located near some other topic? I don't think, that it related to anything. But I can put replay above misc, because it related to one concrete topic. Pavel Dovgalyuk