The following changes since commit 2f93a3ecdd3bb060bd04f698ccafe66efd98563a:
Merge remote-tracking branch
'remotes/davidhildenbrand/tags/s390x-tcg-2019-09-23' into staging (2019-09-23
15:44:52 +0100)
are available in the Git repository at:
git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2019-09-24
for you to fetch changes up to 56176412e7fcfae1c69e4426d94e856b75358231:
qapi: Assert .visit() and .check_clash() run only after .check() (2019-09-24
14:07:23 +0200)
----------------------------------------------------------------
QAPI patches for 2019-09-24
----------------------------------------------------------------
Andrey Shinkevich (1):
make check-unit: use after free in test-opts-visitor
Markus Armbruster (36):
qapi: Make visit_next_list()'s comment less confusing
scripts/git.orderfile: Match QAPI schema more precisely
qapi: Drop check_type()'s redundant parameter @allow_optional
qapi: Drop support for boxed alternate arguments
docs/devel/qapi-code-gen: Minor specification fixes
tests/qapi-schema: Demonstrate bad reporting of funny characters
qapi: Restrict strings to printable ASCII
qapi: Drop support for escape sequences other than \\
qapi: Permit 'boxed' with empty type
qapi: Permit alternates with just one branch
qapi: Permit omitting all flat union branches
qapi: Adjust frontend errors to say enum value, not member
docs/devel/qapi-code-gen: Reorder sections for readability
docs/devel/qapi-code-gen: Rewrite compatibility considerations
docs/devel/qapi-code-gen: Rewrite introduction to schema
docs/devel/qapi-code-gen: Improve QAPI schema language doc
qapi: Tweak code to match docs/devel/qapi-code-gen.txt
tests/qapi-schema: Cover unknown pragma
tests/qapi-schema: Delete two redundant tests
tests/qapi-schema: Demonstrate misleading optional tag error
tests/qapi-schema: Demonstrate broken discriminator errors
tests/qapi-schema: Demonstrate insufficient 'if' checking
tests/qapi-schema: Demonstrate suboptimal lexical errors
qapi: Use quotes more consistently in frontend error messages
qapi: Improve reporting of lexical errors
qapi: Remove null from schema language
qapi: Fix broken discriminator error messages
qapi: Reject blank 'if' conditions in addition to empty ones
qapi: Fix missing 'if' checks in struct, union, alternate 'data'
qapi: Normalize 'if' in check_exprs(), like other sugar
qapi: Simplify check_keys()
qapi: Clean up around check_known_keys()
qapi: Delete useless check_exprs() code for simple union kind
qapi: Fix to .check() empty structs just once
qapi: Fix excessive QAPISchemaEntity.check() recursion
qapi: Assert .visit() and .check_clash() run only after .check()
docs/devel/qapi-code-gen.txt | 1075 +++++++++++---------
include/qapi/visitor.h | 8 +-
qapi/opts-visitor.c | 26 +-
tests/test-qmp-cmds.c | 4 +
scripts/git.orderfile | 4 +-
scripts/qapi/commands.py | 4 +-
scripts/qapi/common.py | 380 ++++---
scripts/qapi/events.py | 12 +-
tests/Makefile.include | 16 +-
tests/qapi-schema/alternate-branch-if-invalid.err | 1 +
...empty.exit => alternate-branch-if-invalid.exit} | 0
tests/qapi-schema/alternate-branch-if-invalid.json | 3 +
...d-empty.out => alternate-branch-if-invalid.out} | 0
tests/qapi-schema/alternate-empty.err | 2 +-
tests/qapi-schema/alternate-empty.json | 4 +-
tests/qapi-schema/args-boxed-empty.err | 1 -
tests/qapi-schema/args-boxed-empty.json | 3 -
tests/qapi-schema/args-invalid.err | 2 +-
tests/qapi-schema/bad-if-list.err | 2 +-
tests/qapi-schema/bad-if-list.json | 2 +-
tests/qapi-schema/bad-type-int.err | 2 +-
tests/qapi-schema/bad-type-int.json | 2 +-
tests/qapi-schema/doc-missing-colon.err | 2 +-
tests/qapi-schema/doc-missing.err | 2 +-
tests/qapi-schema/doc-no-symbol.err | 2 +-
tests/qapi-schema/double-data.err | 1 -
tests/qapi-schema/double-data.json | 2 -
tests/qapi-schema/duplicate-key.err | 2 +-
tests/qapi-schema/duplicate-key.json | 2 +-
tests/qapi-schema/enum-bad-name.err | 2 +-
tests/qapi-schema/enum-bad-name.json | 3 +-
tests/qapi-schema/enum-clash-member.err | 2 +-
tests/qapi-schema/enum-dict-member-unknown.err | 2 +-
tests/qapi-schema/enum-int-member.err | 2 +-
tests/qapi-schema/enum-member-case.err | 2 +-
tests/qapi-schema/escape-outside-string.err | 2 +-
tests/qapi-schema/escape-outside-string.json | 3 -
tests/qapi-schema/escape-too-big.err | 1 -
tests/qapi-schema/escape-too-big.json | 3 -
tests/qapi-schema/escape-too-short.err | 1 -
tests/qapi-schema/escape-too-short.json | 3 -
tests/qapi-schema/features-if-invalid.err | 1 +
.../{double-data.exit => features-if-invalid.exit} | 0
tests/qapi-schema/features-if-invalid.json | 4 +
.../{double-data.out => features-if-invalid.out} | 0
.../flat-union-discriminator-bad-name.err | 1 +
...exit => flat-union-discriminator-bad-name.exit} | 0
.../flat-union-discriminator-bad-name.json | 11 +
...g.out => flat-union-discriminator-bad-name.out} | 0
tests/qapi-schema/flat-union-empty.err | 2 +-
tests/qapi-schema/flat-union-empty.json | 2 +-
.../flat-union-invalid-discriminator.err | 2 +-
.../flat-union-invalid-discriminator.json | 5 +-
.../flat-union-invalid-if-discriminator.err | 2 +-
.../flat-union-invalid-if-discriminator.json | 5 +-
.../flat-union-optional-discriminator.err | 2 +-
.../flat-union-optional-discriminator.json | 3 +-
tests/qapi-schema/funny-char.err | 2 +-
tests/qapi-schema/funny-word.err | 1 +
.../{escape-too-big.exit => funny-word.exit} | 0
tests/qapi-schema/funny-word.json | 1 +
.../{escape-too-big.out => funny-word.out} | 0
tests/qapi-schema/ident-with-escape.err | 1 +
tests/qapi-schema/ident-with-escape.exit | 2 +-
tests/qapi-schema/ident-with-escape.json | 2 +-
tests/qapi-schema/ident-with-escape.out | 16 -
tests/qapi-schema/include-before-err.err | 2 +-
tests/qapi-schema/include-format-err.err | 1 -
tests/qapi-schema/include-format-err.json | 2 -
tests/qapi-schema/include-nested-err.err | 2 +-
tests/qapi-schema/leading-comma-list.err | 2 +-
tests/qapi-schema/leading-comma-object.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 +-
.../pragma-name-case-whitelist-crap.json | 2 +-
tests/qapi-schema/pragma-non-dict.err | 2 +-
tests/qapi-schema/pragma-unknown.err | 1 +
.../{escape-too-short.exit => pragma-unknown.exit} | 0
tests/qapi-schema/pragma-unknown.json | 1 +
.../{escape-too-short.out => pragma-unknown.out} | 0
tests/qapi-schema/qapi-schema-test.json | 13 +-
tests/qapi-schema/qapi-schema-test.out | 21 +-
tests/qapi-schema/quoted-structural-chars.err | 2 +-
tests/qapi-schema/string-code-point-127.err | 1 +
...-format-err.exit => string-code-point-127.exit} | 0
tests/qapi-schema/string-code-point-127.json | 2 +
...de-format-err.out => string-code-point-127.out} | 0
tests/qapi-schema/string-code-point-31.err | 1 +
...{unicode-str.exit => string-code-point-31.exit} | 0
tests/qapi-schema/string-code-point-31.json | 2 +
.../{unicode-str.out => string-code-point-31.out} | 0
tests/qapi-schema/struct-data-invalid.err | 2 +-
tests/qapi-schema/struct-member-if-invalid.err | 1 +
tests/qapi-schema/struct-member-if-invalid.exit | 1 +
tests/qapi-schema/struct-member-if-invalid.json | 3 +
tests/qapi-schema/struct-member-if-invalid.out | 0
tests/qapi-schema/trailing-comma-list.err | 2 +-
tests/qapi-schema/unclosed-list.err | 2 +-
tests/qapi-schema/unclosed-object.err | 2 +-
tests/qapi-schema/unicode-str.err | 1 -
tests/qapi-schema/unicode-str.json | 2 -
tests/qapi-schema/union-base-empty.err | 2 +-
tests/qapi-schema/union-branch-if-invalid.err | 1 +
tests/qapi-schema/union-branch-if-invalid.exit | 1 +
tests/qapi-schema/union-branch-if-invalid.json | 6 +
tests/qapi-schema/union-branch-if-invalid.out | 0
tests/qapi-schema/union-empty.err | 2 +-
tests/qapi-schema/union-empty.json | 2 +-
tests/qapi-schema/unknown-escape.json | 2 +-
111 files changed, 971 insertions(+), 785 deletions(-)
create mode 100644 tests/qapi-schema/alternate-branch-if-invalid.err
rename tests/qapi-schema/{args-boxed-empty.exit =>
alternate-branch-if-invalid.exit} (100%)
create mode 100644 tests/qapi-schema/alternate-branch-if-invalid.json
rename tests/qapi-schema/{args-boxed-empty.out =>
alternate-branch-if-invalid.out} (100%)
delete mode 100644 tests/qapi-schema/args-boxed-empty.err
delete mode 100644 tests/qapi-schema/args-boxed-empty.json
delete mode 100644 tests/qapi-schema/double-data.err
delete mode 100644 tests/qapi-schema/double-data.json
delete mode 100644 tests/qapi-schema/escape-outside-string.json
delete mode 100644 tests/qapi-schema/escape-too-big.err
delete mode 100644 tests/qapi-schema/escape-too-big.json
delete mode 100644 tests/qapi-schema/escape-too-short.err
delete mode 100644 tests/qapi-schema/escape-too-short.json
create mode 100644 tests/qapi-schema/features-if-invalid.err
rename tests/qapi-schema/{double-data.exit => features-if-invalid.exit} (100%)
create mode 100644 tests/qapi-schema/features-if-invalid.json
rename tests/qapi-schema/{double-data.out => features-if-invalid.out} (100%)
create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.err
rename tests/qapi-schema/{escape-outside-string.exit =>
flat-union-discriminator-bad-name.exit} (100%)
create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.json
rename tests/qapi-schema/{escape-outside-string.out =>
flat-union-discriminator-bad-name.out} (100%)
create mode 100644 tests/qapi-schema/funny-word.err
rename tests/qapi-schema/{escape-too-big.exit => funny-word.exit} (100%)
create mode 100644 tests/qapi-schema/funny-word.json
rename tests/qapi-schema/{escape-too-big.out => funny-word.out} (100%)
delete mode 100644 tests/qapi-schema/include-format-err.err
delete mode 100644 tests/qapi-schema/include-format-err.json
create mode 100644 tests/qapi-schema/pragma-unknown.err
rename tests/qapi-schema/{escape-too-short.exit => pragma-unknown.exit} (100%)
create mode 100644 tests/qapi-schema/pragma-unknown.json
rename tests/qapi-schema/{escape-too-short.out => pragma-unknown.out} (100%)
create mode 100644 tests/qapi-schema/string-code-point-127.err
rename tests/qapi-schema/{include-format-err.exit =>
string-code-point-127.exit} (100%)
create mode 100644 tests/qapi-schema/string-code-point-127.json
rename tests/qapi-schema/{include-format-err.out => string-code-point-127.out}
(100%)
create mode 100644 tests/qapi-schema/string-code-point-31.err
rename tests/qapi-schema/{unicode-str.exit => string-code-point-31.exit} (100%)
create mode 100644 tests/qapi-schema/string-code-point-31.json
rename tests/qapi-schema/{unicode-str.out => string-code-point-31.out} (100%)
create mode 100644 tests/qapi-schema/struct-member-if-invalid.err
create mode 100644 tests/qapi-schema/struct-member-if-invalid.exit
create mode 100644 tests/qapi-schema/struct-member-if-invalid.json
create mode 100644 tests/qapi-schema/struct-member-if-invalid.out
delete mode 100644 tests/qapi-schema/unicode-str.err
delete mode 100644 tests/qapi-schema/unicode-str.json
create mode 100644 tests/qapi-schema/union-branch-if-invalid.err
create mode 100644 tests/qapi-schema/union-branch-if-invalid.exit
create mode 100644 tests/qapi-schema/union-branch-if-invalid.json
create mode 100644 tests/qapi-schema/union-branch-if-invalid.out
--
2.21.0
