qapi: Use an explicit input file
Use an explicit input file on the command-line instead of reading from standard input. It also outputs the proper file name when there's an error. Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Lluís Vilanova
Luiz Capitulino
parent
98c1200af1
commit
33aaad529e
12
Makefile
12
Makefile
|
|
@ -239,33 +239,33 @@ qapi-py = $(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 $(qapi-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 $(qapi-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 $@")
|
||||
|
||||
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 $@")
|
||||
|
||||
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ created code.
|
|||
Example:
|
||||
|
||||
mdroth@illuin:~/w/qemu2.git$ python scripts/qapi-types.py \
|
||||
--output-dir="qapi-generated" --prefix="example-" < example-schema.json
|
||||
--output-dir="qapi-generated" --prefix="example-" --input-file=example-schema.json
|
||||
mdroth@illuin:~/w/qemu2.git$ cat qapi-generated/example-qapi-types.c
|
||||
/* AUTOMATICALLY GENERATED, DO NOT MODIFY */
|
||||
|
||||
|
|
@ -291,7 +291,7 @@ $(prefix)qapi-visit.h: declarations for previously mentioned visitor
|
|||
Example:
|
||||
|
||||
mdroth@illuin:~/w/qemu2.git$ python scripts/qapi-visit.py \
|
||||
--output-dir="qapi-generated" --prefix="example-" < example-schema.json
|
||||
--output-dir="qapi-generated" --prefix="example-" --input-file=example-schema.json
|
||||
mdroth@illuin:~/w/qemu2.git$ cat qapi-generated/example-qapi-visit.c
|
||||
/* THIS FILE IS AUTOMATICALLY GENERATED, DO NOT MODIFY */
|
||||
|
||||
|
|
|
|||
|
|
@ -369,9 +369,10 @@ def gen_command_def_prologue(prefix="", proxy=False):
|
|||
|
||||
|
||||
try:
|
||||
opts, args = getopt.gnu_getopt(sys.argv[1:], "chp:o:m",
|
||||
opts, args = getopt.gnu_getopt(sys.argv[1:], "chp:i:o:m",
|
||||
["source", "header", "prefix=",
|
||||
"output-dir=", "type=", "middle"])
|
||||
"input-file=", "output-dir=",
|
||||
"type=", "middle"])
|
||||
except getopt.GetoptError, err:
|
||||
print str(err)
|
||||
sys.exit(1)
|
||||
|
|
@ -389,6 +390,8 @@ do_h = False
|
|||
for o, a in opts:
|
||||
if o in ("-p", "--prefix"):
|
||||
prefix = a
|
||||
elif o in ("-i", "--input-file"):
|
||||
input_file = a
|
||||
elif o in ("-o", "--output-dir"):
|
||||
output_dir = a + "/"
|
||||
elif o in ("-t", "--type"):
|
||||
|
|
@ -420,7 +423,7 @@ except os.error, e:
|
|||
if e.errno != errno.EEXIST:
|
||||
raise
|
||||
|
||||
exprs = parse_schema(sys.stdin)
|
||||
exprs = parse_schema(input_file)
|
||||
commands = filter(lambda expr: expr.has_key('command'), exprs)
|
||||
commands = filter(lambda expr: not expr.has_key('gen'), commands)
|
||||
|
||||
|
|
|
|||
|
|
@ -279,14 +279,15 @@ void qapi_free_%(type)s(%(c_type)s obj)
|
|||
|
||||
|
||||
try:
|
||||
opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:o:",
|
||||
opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:i:o:",
|
||||
["source", "header", "builtins",
|
||||
"prefix=", "output-dir="])
|
||||
"prefix=", "input-file=", "output-dir="])
|
||||
except getopt.GetoptError, err:
|
||||
print str(err)
|
||||
sys.exit(1)
|
||||
|
||||
output_dir = ""
|
||||
input_file = ""
|
||||
prefix = ""
|
||||
c_file = 'qapi-types.c'
|
||||
h_file = 'qapi-types.h'
|
||||
|
|
@ -298,6 +299,8 @@ do_builtins = False
|
|||
for o, a in opts:
|
||||
if o in ("-p", "--prefix"):
|
||||
prefix = a
|
||||
elif o in ("-i", "--input-file"):
|
||||
input_file = a
|
||||
elif o in ("-o", "--output-dir"):
|
||||
output_dir = a + "/"
|
||||
elif o in ("-c", "--source"):
|
||||
|
|
@ -378,7 +381,7 @@ fdecl.write(mcgen('''
|
|||
''',
|
||||
guard=guardname(h_file)))
|
||||
|
||||
exprs = parse_schema(sys.stdin)
|
||||
exprs = parse_schema(input_file)
|
||||
exprs = filter(lambda expr: not expr.has_key('gen'), exprs)
|
||||
|
||||
fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
|
||||
|
|
|
|||
|
|
@ -397,13 +397,14 @@ void visit_type_%(name)s(Visitor *m, %(name)s * obj, const char *name, Error **e
|
|||
name=name)
|
||||
|
||||
try:
|
||||
opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:o:",
|
||||
opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:i:o:",
|
||||
["source", "header", "builtins", "prefix=",
|
||||
"output-dir="])
|
||||
"input-file=", "output-dir="])
|
||||
except getopt.GetoptError, err:
|
||||
print str(err)
|
||||
sys.exit(1)
|
||||
|
||||
input_file = ""
|
||||
output_dir = ""
|
||||
prefix = ""
|
||||
c_file = 'qapi-visit.c'
|
||||
|
|
@ -416,6 +417,8 @@ do_builtins = False
|
|||
for o, a in opts:
|
||||
if o in ("-p", "--prefix"):
|
||||
prefix = a
|
||||
elif o in ("-i", "--input-file"):
|
||||
input_file = a
|
||||
elif o in ("-o", "--output-dir"):
|
||||
output_dir = a + "/"
|
||||
elif o in ("-c", "--source"):
|
||||
|
|
@ -494,7 +497,7 @@ fdecl.write(mcgen('''
|
|||
''',
|
||||
prefix=prefix, guard=guardname(h_file)))
|
||||
|
||||
exprs = parse_schema(sys.stdin)
|
||||
exprs = parse_schema(input_file)
|
||||
|
||||
# to avoid header dependency hell, we always generate declarations
|
||||
# for built-in types in our header files and simply guard them
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
# See the COPYING file in the top-level directory.
|
||||
|
||||
from ordereddict import OrderedDict
|
||||
import os
|
||||
import sys
|
||||
|
||||
builtin_types = [
|
||||
|
|
@ -263,9 +264,9 @@ def check_exprs(schema):
|
|||
if expr.has_key('union'):
|
||||
check_union(expr, expr_elem['info'])
|
||||
|
||||
def parse_schema(fp):
|
||||
def parse_schema(input_file):
|
||||
try:
|
||||
schema = QAPISchema(fp)
|
||||
schema = QAPISchema(open(input_file, "r"))
|
||||
except QAPISchemaError, e:
|
||||
print >>sys.stderr, e
|
||||
exit(1)
|
||||
|
|
|
|||
|
|
@ -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 $@")
|
||||
|
||||
tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visitor.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=$(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
|
||||
|
||||
# Consolidated targets
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:2:10: Duplicate key "key"
|
||||
tests/qapi-schema/duplicate-key.json:2:10: Duplicate key "key"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:13: Discriminator value 'value_wrong' is not found in enum 'TestEnum'
|
||||
tests/qapi-schema/flat-union-invalid-branch-key.json:13: Discriminator value 'value_wrong' is not found in enum 'TestEnum'
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:13: Discriminator 'enum_wrong' is not a member of base type 'TestBase'
|
||||
tests/qapi-schema/flat-union-invalid-discriminator.json:13: Discriminator 'enum_wrong' is not a member of base type 'TestBase'
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>: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
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:13: Discriminator 'kind' must be of enumeration type
|
||||
tests/qapi-schema/flat-union-string-discriminator.json:13: Discriminator 'kind' must be of enumeration type
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:2:36: Stray ";"
|
||||
tests/qapi-schema/funny-char.json:2:36: Stray ";"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:1:10: Expected ":"
|
||||
tests/qapi-schema/missing-colon.json:1:10: Expected ":"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:2:20: Expected "," or "]"
|
||||
tests/qapi-schema/missing-comma-list.json:2:20: Expected "," or "]"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:2:3: Expected "," or "}"
|
||||
tests/qapi-schema/missing-comma-object.json:2:3: Expected "," or "}"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:1:1: Expected "{"
|
||||
tests/qapi-schema/non-objects.json:1:1: Expected "{"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:1:1: Expected "{"
|
||||
tests/qapi-schema/quoted-structural-chars.json:1:1: Expected "{"
|
||||
|
|
|
|||
|
|
@ -12,10 +12,11 @@
|
|||
|
||||
from qapi import *
|
||||
from pprint import pprint
|
||||
import os
|
||||
import sys
|
||||
|
||||
try:
|
||||
exprs = parse_schema(sys.stdin)
|
||||
exprs = parse_schema(sys.argv[1])
|
||||
except SystemExit:
|
||||
raise
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:2:36: Expected "{", "[" or string
|
||||
tests/qapi-schema/trailing-comma-list.json:2:36: Expected "{", "[" or string
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:2:38: Expected string
|
||||
tests/qapi-schema/trailing-comma-object.json:2:38: Expected string
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:1:20: Expected "," or "]"
|
||||
tests/qapi-schema/unclosed-list.json:1:20: Expected "," or "]"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:1:21: Expected "," or "}"
|
||||
tests/qapi-schema/unclosed-object.json:1:21: Expected "," or "}"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:1:11: Missing terminating "'"
|
||||
tests/qapi-schema/unclosed-string.json:1:11: Missing terminating "'"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<stdin>:7: Base 'TestBaseWrong' is not a valid type
|
||||
tests/qapi-schema/union-invalid-base.json:7: Base 'TestBaseWrong' is not a valid type
|
||||
|
|
|
|||
Loading…
Reference in a new issue