From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiTRX-0007sR-Ty for qemu-devel@nongnu.org; Thu, 08 May 2014 14:53:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WiTRT-0008Kq-OY for qemu-devel@nongnu.org; Thu, 08 May 2014 14:53:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6567) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiTRT-0008Ka-Dl for qemu-devel@nongnu.org; Thu, 08 May 2014 14:53:15 -0400 From: Luiz Capitulino Date: Thu, 8 May 2014 14:52:27 -0400 Message-Id: <1399575182-9768-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1399575182-9768-1-git-send-email-lcapitulino@redhat.com> References: <1399575182-9768-1-git-send-email-lcapitulino@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 03/38] qapi: Use an explicit input file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws From: Llu=C3=ADs Vilanova Use an explicit input file on the command-line instead of reading from st= andard input. It also outputs the proper file name when there's an error. Signed-off-by: Llu=C3=ADs Vilanova Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster Signed-off-by: Luiz Capitulino --- Makefile | 12 ++++++------ docs/qapi-code-gen.txt | 4 ++-- scripts/qapi-commands.py | 9 ++++++--- scripts/qapi-types.py | 9 ++++++--- scripts/qapi-visit.py | 9 ++++++--- scripts/qapi.py | 5 +++-- tests/Makefile | 11 ++++++----- tests/qapi-schema/duplicate-key.err | 2 +- tests/qapi-schema/flat-union-invalid-branch-key.err | 2 +- tests/qapi-schema/flat-union-invalid-discriminator.err | 2 +- tests/qapi-schema/flat-union-no-base.err | 2 +- tests/qapi-schema/flat-union-string-discriminator.err | 2 +- tests/qapi-schema/funny-char.err | 2 +- 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 +- 25 files changed, 54 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index 2b8e312..a120aab 100644 --- a/Makefile +++ b/Makefile @@ -239,33 +239,33 @@ qapi-py =3D $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)= /scripts/ordereddict.py qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h = :\ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qap= i-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \ - $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, \ + $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \ " GEN $@") qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h = :\ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qap= i-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \ - $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, \ + $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \ " GEN $@") qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal= .c :\ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(= qapi-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \ - $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, \ + $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \ " GEN $@") =20 qapi-types.c qapi-types.h :\ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py= ) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \ - $(gen-out-type) -o "." -b < $<, \ + $(gen-out-type) -o "." -b -i $<, \ " GEN $@") qapi-visit.c qapi-visit.h :\ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py= ) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \ - $(gen-out-type) -o "." -b < $<, \ + $(gen-out-type) -o "." -b -i $<, \ " GEN $@") qmp-commands.h qmp-marshal.c :\ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi= -py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \ - $(gen-out-type) -o "." -m < $<, \ + $(gen-out-type) -o "." -m -i $<, \ " GEN $@") =20 QGALIB_GEN=3D$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-= visit.h qga-qmp-commands.h) diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt index d78921f..63b03cf 100644 --- a/docs/qapi-code-gen.txt +++ b/docs/qapi-code-gen.txt @@ -221,7 +221,7 @@ created code. Example: =20 mdroth@illuin:~/w/qemu2.git$ python scripts/qapi-types.py \ - --output-dir=3D"qapi-generated" --prefix=3D"example-" < example-sc= hema.json + --output-dir=3D"qapi-generated" --prefix=3D"example-" --input-file= =3Dexample-schema.json mdroth@illuin:~/w/qemu2.git$ cat qapi-generated/example-qapi-types.c /* AUTOMATICALLY GENERATED, DO NOT MODIFY */ =20 @@ -291,7 +291,7 @@ $(prefix)qapi-visit.h: declarations for previously me= ntioned visitor Example: =20 mdroth@illuin:~/w/qemu2.git$ python scripts/qapi-visit.py \ - --output-dir=3D"qapi-generated" --prefix=3D"example-" < example-= schema.json + --output-dir=3D"qapi-generated" --prefix=3D"example-" --input-fi= le=3Dexample-schema.json mdroth@illuin:~/w/qemu2.git$ cat qapi-generated/example-qapi-visit.c /* THIS FILE IS AUTOMATICALLY GENERATED, DO NOT MODIFY */ =20 diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 9734ab0..8d9096f 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -369,9 +369,10 @@ def gen_command_def_prologue(prefix=3D"", proxy=3DFa= lse): =20 =20 try: - opts, args =3D getopt.gnu_getopt(sys.argv[1:], "chp:o:m", + opts, args =3D getopt.gnu_getopt(sys.argv[1:], "chp:i:o:m", ["source", "header", "prefix=3D", - "output-dir=3D", "type=3D", "middle"= ]) + "input-file=3D", "output-dir=3D", + "type=3D", "middle"]) except getopt.GetoptError, err: print str(err) sys.exit(1) @@ -389,6 +390,8 @@ do_h =3D False for o, a in opts: if o in ("-p", "--prefix"): prefix =3D a + elif o in ("-i", "--input-file"): + input_file =3D a elif o in ("-o", "--output-dir"): output_dir =3D a + "/" elif o in ("-t", "--type"): @@ -420,7 +423,7 @@ except os.error, e: if e.errno !=3D errno.EEXIST: raise =20 -exprs =3D parse_schema(sys.stdin) +exprs =3D parse_schema(input_file) commands =3D filter(lambda expr: expr.has_key('command'), exprs) commands =3D filter(lambda expr: not expr.has_key('gen'), commands) =20 diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 10864ef..b463232 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -279,14 +279,15 @@ void qapi_free_%(type)s(%(c_type)s obj) =20 =20 try: - opts, args =3D getopt.gnu_getopt(sys.argv[1:], "chbp:o:", + opts, args =3D getopt.gnu_getopt(sys.argv[1:], "chbp:i:o:", ["source", "header", "builtins", - "prefix=3D", "output-dir=3D"]) + "prefix=3D", "input-file=3D", "outpu= t-dir=3D"]) except getopt.GetoptError, err: print str(err) sys.exit(1) =20 output_dir =3D "" +input_file =3D "" prefix =3D "" c_file =3D 'qapi-types.c' h_file =3D 'qapi-types.h' @@ -298,6 +299,8 @@ do_builtins =3D False for o, a in opts: if o in ("-p", "--prefix"): prefix =3D a + elif o in ("-i", "--input-file"): + input_file =3D a elif o in ("-o", "--output-dir"): output_dir =3D a + "/" elif o in ("-c", "--source"): @@ -378,7 +381,7 @@ fdecl.write(mcgen(''' ''', guard=3Dguardname(h_file))) =20 -exprs =3D parse_schema(sys.stdin) +exprs =3D parse_schema(input_file) exprs =3D filter(lambda expr: not expr.has_key('gen'), exprs) =20 fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL")) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 45ce3a9..c6579be 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -397,13 +397,14 @@ void visit_type_%(name)s(Visitor *m, %(name)s * obj= , const char *name, Error **e name=3Dname) =20 try: - opts, args =3D getopt.gnu_getopt(sys.argv[1:], "chbp:o:", + opts, args =3D getopt.gnu_getopt(sys.argv[1:], "chbp:i:o:", ["source", "header", "builtins", "pre= fix=3D", - "output-dir=3D"]) + "input-file=3D", "output-dir=3D"]) except getopt.GetoptError, err: print str(err) sys.exit(1) =20 +input_file =3D "" output_dir =3D "" prefix =3D "" c_file =3D 'qapi-visit.c' @@ -416,6 +417,8 @@ do_builtins =3D False for o, a in opts: if o in ("-p", "--prefix"): prefix =3D a + elif o in ("-i", "--input-file"): + input_file =3D a elif o in ("-o", "--output-dir"): output_dir =3D a + "/" elif o in ("-c", "--source"): @@ -494,7 +497,7 @@ fdecl.write(mcgen(''' ''', prefix=3Dprefix, guard=3Dguardname(h_file))) =20 -exprs =3D parse_schema(sys.stdin) +exprs =3D parse_schema(input_file) =20 # to avoid header dependency hell, we always generate declarations # for built-in types in our header files and simply guard them diff --git a/scripts/qapi.py b/scripts/qapi.py index b474c39..07a7a82 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -12,6 +12,7 @@ # See the COPYING file in the top-level directory. =20 from ordereddict import OrderedDict +import os import sys =20 builtin_types =3D [ @@ -263,9 +264,9 @@ def check_exprs(schema): if expr.has_key('union'): check_union(expr, expr_elem['info']) =20 -def parse_schema(fp): +def parse_schema(input_file): try: - schema =3D QAPISchema(fp) + schema =3D QAPISchema(open(input_file, "r")) except QAPISchemaError, e: print >>sys.stderr, e exit(1) diff --git a/tests/Makefile b/tests/Makefile index c7fb2df..6ddfa82 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -243,17 +243,17 @@ tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ tests/test-qapi-types.c tests/test-qapi-types.h :\ $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/= qapi-types.py $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \ - $(gen-out-type) -o tests -p "test-" < $<, \ + $(gen-out-type) -o tests -p "test-" -i $<, \ " GEN $@") tests/test-qapi-visit.c tests/test-qapi-visit.h :\ $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/= qapi-visit.py $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \ - $(gen-out-type) -o tests -p "test-" < $<, \ + $(gen-out-type) -o tests -p "test-" -i $<, \ " GEN $@") tests/test-qmp-commands.h tests/test-qmp-marshal.c :\ $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/= qapi-commands.py $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \ - $(gen-out-type) -o tests -p "test-" < $<, \ + $(gen-out-type) -o tests -p "test-" -i $<, \ " GEN $@") =20 tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visi= tor.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a @@ -408,11 +408,12 @@ check-tests/test-qapi.py: tests/test-qapi.py $(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH= )/%.json $(call quiet-command, PYTHONPATH=3D$(SRC_PATH)/scripts \ $(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-qapi.py \ - <$^ >$*.test.out 2>$*.test.err; \ + $^ >$*.test.out 2>$*.test.err; \ echo $$? >$*.test.exit, \ " TEST $*.out") @diff -q $(SRC_PATH)/$*.out $*.test.out - @diff -q $(SRC_PATH)/$*.err $*.test.err + @# Sanitize error messages (make them independent of build directory) + @perl -p -e 's|\Q$(SRC_PATH)\E/||g' $*.test.err | diff -q $(SRC_PATH)/$= *.err - @diff -q $(SRC_PATH)/$*.exit $*.test.exit =20 # Consolidated targets diff --git a/tests/qapi-schema/duplicate-key.err b/tests/qapi-schema/dupl= icate-key.err index 0801c6a..768b276 100644 --- a/tests/qapi-schema/duplicate-key.err +++ b/tests/qapi-schema/duplicate-key.err @@ -1 +1 @@ -:2:10: Duplicate key "key" +tests/qapi-schema/duplicate-key.json:2:10: Duplicate key "key" diff --git a/tests/qapi-schema/flat-union-invalid-branch-key.err b/tests/= qapi-schema/flat-union-invalid-branch-key.err index 1125caf..ccf72d2 100644 --- a/tests/qapi-schema/flat-union-invalid-branch-key.err +++ b/tests/qapi-schema/flat-union-invalid-branch-key.err @@ -1 +1 @@ -:13: Discriminator value 'value_wrong' is not found in enum 'Test= Enum' +tests/qapi-schema/flat-union-invalid-branch-key.json:13: Discriminator v= alue 'value_wrong' is not found in enum 'TestEnum' diff --git a/tests/qapi-schema/flat-union-invalid-discriminator.err b/tes= ts/qapi-schema/flat-union-invalid-discriminator.err index cad9dbf..790b675 100644 --- a/tests/qapi-schema/flat-union-invalid-discriminator.err +++ b/tests/qapi-schema/flat-union-invalid-discriminator.err @@ -1 +1 @@ -:13: Discriminator 'enum_wrong' is not a member of base type 'Tes= tBase' +tests/qapi-schema/flat-union-invalid-discriminator.json:13: Discriminato= r 'enum_wrong' is not a member of base type 'TestBase' diff --git a/tests/qapi-schema/flat-union-no-base.err b/tests/qapi-schema= /flat-union-no-base.err index e2d7443..a59749e 100644 --- a/tests/qapi-schema/flat-union-no-base.err +++ b/tests/qapi-schema/flat-union-no-base.err @@ -1 +1 @@ -:7: Flat union 'TestUnion' must have a base field +tests/qapi-schema/flat-union-no-base.json:7: Flat union 'TestUnion' must= have a base field diff --git a/tests/qapi-schema/flat-union-string-discriminator.err b/test= s/qapi-schema/flat-union-string-discriminator.err index 8748270..200016b 100644 --- a/tests/qapi-schema/flat-union-string-discriminator.err +++ b/tests/qapi-schema/flat-union-string-discriminator.err @@ -1 +1 @@ -:13: Discriminator 'kind' must be of enumeration type +tests/qapi-schema/flat-union-string-discriminator.json:13: Discriminator= 'kind' must be of enumeration type diff --git a/tests/qapi-schema/funny-char.err b/tests/qapi-schema/funny-c= har.err index d3dd293..bfc890c 100644 --- a/tests/qapi-schema/funny-char.err +++ b/tests/qapi-schema/funny-char.err @@ -1 +1 @@ -:2:36: Stray ";" +tests/qapi-schema/funny-char.json:2:36: Stray ";" diff --git a/tests/qapi-schema/missing-colon.err b/tests/qapi-schema/miss= ing-colon.err index 9f2a355..d9d66b3 100644 --- a/tests/qapi-schema/missing-colon.err +++ b/tests/qapi-schema/missing-colon.err @@ -1 +1 @@ -:1:10: Expected ":" +tests/qapi-schema/missing-colon.json:1:10: Expected ":" diff --git a/tests/qapi-schema/missing-comma-list.err b/tests/qapi-schema= /missing-comma-list.err index 4fe0700..e73d277 100644 --- a/tests/qapi-schema/missing-comma-list.err +++ b/tests/qapi-schema/missing-comma-list.err @@ -1 +1 @@ -:2:20: Expected "," or "]" +tests/qapi-schema/missing-comma-list.json:2:20: Expected "," or "]" diff --git a/tests/qapi-schema/missing-comma-object.err b/tests/qapi-sche= ma/missing-comma-object.err index b0121b5..52b3a8a 100644 --- a/tests/qapi-schema/missing-comma-object.err +++ b/tests/qapi-schema/missing-comma-object.err @@ -1 +1 @@ -:2:3: Expected "," or "}" +tests/qapi-schema/missing-comma-object.json:2:3: Expected "," or "}" diff --git a/tests/qapi-schema/non-objects.err b/tests/qapi-schema/non-ob= jects.err index a6c2dc2..334f0c9 100644 --- a/tests/qapi-schema/non-objects.err +++ b/tests/qapi-schema/non-objects.err @@ -1 +1 @@ -:1:1: Expected "{" +tests/qapi-schema/non-objects.json:1:1: Expected "{" diff --git a/tests/qapi-schema/quoted-structural-chars.err b/tests/qapi-s= chema/quoted-structural-chars.err index a6c2dc2..9b18384 100644 --- a/tests/qapi-schema/quoted-structural-chars.err +++ b/tests/qapi-schema/quoted-structural-chars.err @@ -1 +1 @@ -:1:1: Expected "{" +tests/qapi-schema/quoted-structural-chars.json:1:1: Expected "{" diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi= .py index 5a26ef3..634ef2d 100644 --- a/tests/qapi-schema/test-qapi.py +++ b/tests/qapi-schema/test-qapi.py @@ -12,10 +12,11 @@ =20 from qapi import * from pprint import pprint +import os import sys =20 try: - exprs =3D parse_schema(sys.stdin) + exprs =3D parse_schema(sys.argv[1]) except SystemExit: raise =20 diff --git a/tests/qapi-schema/trailing-comma-list.err b/tests/qapi-schem= a/trailing-comma-list.err index ff839a3..24c24b0 100644 --- a/tests/qapi-schema/trailing-comma-list.err +++ b/tests/qapi-schema/trailing-comma-list.err @@ -1 +1 @@ -:2:36: Expected "{", "[" or string +tests/qapi-schema/trailing-comma-list.json:2:36: Expected "{", "[" or st= ring diff --git a/tests/qapi-schema/trailing-comma-object.err b/tests/qapi-sch= ema/trailing-comma-object.err index f540962..30bce5e 100644 --- a/tests/qapi-schema/trailing-comma-object.err +++ b/tests/qapi-schema/trailing-comma-object.err @@ -1 +1 @@ -:2:38: Expected string +tests/qapi-schema/trailing-comma-object.json:2:38: Expected string diff --git a/tests/qapi-schema/unclosed-list.err b/tests/qapi-schema/uncl= osed-list.err index 0e837a7..fb41a86 100644 --- a/tests/qapi-schema/unclosed-list.err +++ b/tests/qapi-schema/unclosed-list.err @@ -1 +1 @@ -:1:20: Expected "," or "]" +tests/qapi-schema/unclosed-list.json:1:20: Expected "," or "]" diff --git a/tests/qapi-schema/unclosed-object.err b/tests/qapi-schema/un= closed-object.err index e6dc950..db3deed 100644 --- a/tests/qapi-schema/unclosed-object.err +++ b/tests/qapi-schema/unclosed-object.err @@ -1 +1 @@ -:1:21: Expected "," or "}" +tests/qapi-schema/unclosed-object.json:1:21: Expected "," or "}" diff --git a/tests/qapi-schema/unclosed-string.err b/tests/qapi-schema/un= closed-string.err index 948d883..12b1870 100644 --- a/tests/qapi-schema/unclosed-string.err +++ b/tests/qapi-schema/unclosed-string.err @@ -1 +1 @@ -:1:11: Missing terminating "'" +tests/qapi-schema/unclosed-string.json:1:11: Missing terminating "'" diff --git a/tests/qapi-schema/union-invalid-base.err b/tests/qapi-schema= /union-invalid-base.err index dd8e3d1..938f969 100644 --- a/tests/qapi-schema/union-invalid-base.err +++ b/tests/qapi-schema/union-invalid-base.err @@ -1 +1 @@ -:7: Base 'TestBaseWrong' is not a valid type +tests/qapi-schema/union-invalid-base.json:7: Base 'TestBaseWrong' is not= a valid type --=20 1.9.0