From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUeJK-0002lM-5J for qemu-devel@nongnu.org; Mon, 31 Mar 2014 11:39:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUeJG-0004u1-1M for qemu-devel@nongnu.org; Mon, 31 Mar 2014 11:39:42 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:38888 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUeJF-0004tc-OC for qemu-devel@nongnu.org; Mon, 31 Mar 2014 11:39:37 -0400 Date: Mon, 31 Mar 2014 17:39:37 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140331153937.GB4277@irqsave.net> References: <20140330203508.16278.39223.stgit@fimbulvetr.bsc.es> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20140330203508.16278.39223.stgit@fimbulvetr.bsc.es> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCHv50/3] qapi: Allow modularization of QAPI schema files List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Llu=EDs?= Vilanova Cc: =?iso-8859-1?Q?Beno=EEt?= Canet , Markus Armbruster , qemu-devel@nongnu.org, Luiz Capitulino The Sunday 30 Mar 2014 =E0 22:35:09 (+0200), Llu=EDs Vilanova wrote : > Adds an include primitive to the syntax of QAPI schema files, allowing = these to > be modularized into multiple per-topic files in the future. >=20 > Signed-off-by: Llu=EDs Vilanova > --- >=20 > Changes in v5: >=20 > * Rebase on b3706fa. > * Remove 'error_base' argument in 'parse_schema'; fix test checks inste= ad. > * Implement include directive using JSON syntax. >=20 > Changes in v4: >=20 > * Rebase on 3e890c7. > * Minor cosmetic changes. > * Fix recording of included files in case of a cycle error. > * Add a more complex include cycle test. >=20 >=20 > Changes in v3: >=20 > * Fix documentation examples regarding how the input file is passed to = the > scripts. > * Add documentation for the 'include' directive. > * Detect inclusion loops. > * Fix "tests/qapi-schema/test-qapi.py" and "tests/Makefile" to use an e= xplicit > input file when running tests. > * Fix QAPI tests to cope with an explicit input file. > * Add tests for the "include" directive. >=20 >=20 > Changes in v2: >=20 > * Change the scripts to use an explicit input file instead of standard = input. > * Fix "tests/Makefile" to use the new argument. > * Get the input directory for the "include" directive from the input fi= le > dirname. >=20 >=20 > Llu=EDs Vilanova (3): > qapi: Use an explicit input file > qapi: Add a primitive to include other files from a QAPI schema f= ile > qapi: Add tests for the "include" directive Hi Llu=EDs, I am embarassed. Since you said me that you would not have time to work on your series unt= il the end of the month I send my own and forget to put you in copy. Now we have two include patchset and we must do a choice. The selling point of mine is that I can iterate fast on it. Do you think you will have time to work on yours during the next weeks ? Which one should we keep ? Best regards Beno=EEt >=20 >=20 > Makefile | 24 +++++++++--- > docs/qapi-code-gen.txt | 11 +++++- > scripts/qapi-commands.py | 10 ++++- > scripts/qapi-types.py | 9 +++-- > scripts/qapi-visit.py | 9 +++-- > scripts/qapi.py | 40 ++++++++++++= +++++--- > tests/Makefile | 19 +++++++--- > tests/qapi-schema/duplicate-key.err | 2 + > .../qapi-schema/flat-union-invalid-branch-key.err | 2 + > .../flat-union-invalid-discriminator.err | 2 + > tests/qapi-schema/flat-union-no-base.err | 2 + > .../flat-union-string-discriminator.err | 2 + > tests/qapi-schema/funny-char.err | 2 + > tests/qapi-schema/include-cycle-b.json | 1 + > tests/qapi-schema/include-cycle-c.json | 1 + > tests/qapi-schema/include-cycle.err | 1 + > tests/qapi-schema/include-cycle.exit | 1 + > tests/qapi-schema/include-cycle.json | 1 + > tests/qapi-schema/include-cycle.out | 0=20 > tests/qapi-schema/include-nested-err.err | 1 + > tests/qapi-schema/include-nested-err.exit | 1 + > tests/qapi-schema/include-nested-err.json | 1 + > tests/qapi-schema/include-nested-err.out | 0=20 > tests/qapi-schema/include-no-file.err | 1 + > tests/qapi-schema/include-no-file.exit | 1 + > tests/qapi-schema/include-no-file.json | 1 + > tests/qapi-schema/include-no-file.out | 0=20 > tests/qapi-schema/include-self-cycle.err | 1 + > tests/qapi-schema/include-self-cycle.exit | 1 + > tests/qapi-schema/include-self-cycle.json | 1 + > tests/qapi-schema/include-self-cycle.out | 0=20 > tests/qapi-schema/include-simple-sub.json | 2 + > tests/qapi-schema/include-simple.err | 0=20 > tests/qapi-schema/include-simple.exit | 1 + > tests/qapi-schema/include-simple.json | 1 + > tests/qapi-schema/include-simple.out | 3 ++ > tests/qapi-schema/missing-colon.err | 2 + > tests/qapi-schema/missing-comma-list.err | 2 + > tests/qapi-schema/missing-comma-object.err | 2 + > tests/qapi-schema/non-objects.err | 2 + > tests/qapi-schema/quoted-structural-chars.err | 2 + > tests/qapi-schema/test-qapi.py | 3 +- > tests/qapi-schema/trailing-comma-list.err | 2 + > tests/qapi-schema/trailing-comma-object.err | 2 + > tests/qapi-schema/unclosed-list.err | 2 + > tests/qapi-schema/unclosed-object.err | 2 + > tests/qapi-schema/unclosed-string.err | 2 + > tests/qapi-schema/union-invalid-base.err | 2 + > 48 files changed, 133 insertions(+), 47 deletions(-) > create mode 100644 tests/qapi-schema/include-cycle-b.json > create mode 100644 tests/qapi-schema/include-cycle-c.json > create mode 100644 tests/qapi-schema/include-cycle.err > create mode 100644 tests/qapi-schema/include-cycle.exit > create mode 100644 tests/qapi-schema/include-cycle.json > create mode 100644 tests/qapi-schema/include-cycle.out > create mode 100644 tests/qapi-schema/include-nested-err.err > create mode 100644 tests/qapi-schema/include-nested-err.exit > create mode 100644 tests/qapi-schema/include-nested-err.json > create mode 100644 tests/qapi-schema/include-nested-err.out > create mode 100644 tests/qapi-schema/include-no-file.err > create mode 100644 tests/qapi-schema/include-no-file.exit > create mode 100644 tests/qapi-schema/include-no-file.json > create mode 100644 tests/qapi-schema/include-no-file.out > create mode 100644 tests/qapi-schema/include-self-cycle.err > create mode 100644 tests/qapi-schema/include-self-cycle.exit > create mode 100644 tests/qapi-schema/include-self-cycle.json > create mode 100644 tests/qapi-schema/include-self-cycle.out > create mode 100644 tests/qapi-schema/include-simple-sub.json > create mode 100644 tests/qapi-schema/include-simple.err > create mode 100644 tests/qapi-schema/include-simple.exit > create mode 100644 tests/qapi-schema/include-simple.json > create mode 100644 tests/qapi-schema/include-simple.out >=20 >=20 > To: qemu-devel@nongnu.org > Cc: Luiz Capitulino > Cc: Markus Armbruster > Cc: Eric Blake > Cc: Beno=EEt Canet