Skip to content

qapi: Frontend fixes and cleanups

Markus Armbruster qemu-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest19 patches 23 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/19tests/qapi-schema: Cover unknown pragmatests/Makefile.include tests/qapi-schema/pragma-unknown.err tests/qapi-schema/pragma-unknown.exit +2 more+4 -01 reply
2/19tests/qapi-schema: Delete two redundant teststests/Makefile.include tests/qapi-schema/double-data.err tests/qapi-schema/double-data.exit +7 more+1 -111 reply
3/19tests/qapi-schema: Demonstrate misleading optional tag errortests/Makefile.include tests/qapi-schema/flat-union-discriminator-bad-name.err tests/qapi-schema/flat-union-discriminator-bad-name.exit +4 more+17 -21 reply
4/19tests/qapi-schema: Demonstrate broken discriminator errorstests/qapi-schema/flat-union-invalid-discriminator.err tests/qapi-schema/flat-union-invalid-discriminator.json tests/qapi-schema/flat-union-invalid-if-discriminator.err +1 more+6 -101 reply
5/19tests/qapi-schema: Demonstrate insufficient 'if' checkingtests/Makefile.include tests/qapi-schema/alternate-branch-if-invalid.err tests/qapi-schema/alternate-branch-if-invalid.exit +14 more+96 -03 replies
6/19tests/qapi-schema: Demonstrate suboptimal lexical errorstests/Makefile.include tests/qapi-schema/bad-type-int.json tests/qapi-schema/funny-word.err +3 more+5 -11 reply
7/19qapi: Use quotes more consistently in frontend error messagesscripts/qapi/common.py tests/qapi-schema/bad-type-int.err tests/qapi-schema/doc-missing-colon.err +17 more+38 -361 reply
8/19qapi: Improve reporting of lexical errorsscripts/qapi/common.py tests/qapi-schema/bad-type-int.err tests/qapi-schema/funny-word.err+7 -31 reply
9/19qapi: Remove null from schema languagedocs/devel/qapi-code-gen.txt scripts/qapi/common.py tests/qapi-schema/features-if-invalid.err +4 more+6 -241 reply
10/19qapi: Fix broken discriminator error messagesscripts/qapi/common.py tests/qapi-schema/flat-union-invalid-discriminator.err tests/qapi-schema/flat-union-invalid-discriminator.json +4 more+8 -111 reply
11/19qapi: Reject blank 'if' conditions in addition to empty onesscripts/qapi/common.py tests/qapi-schema/bad-if-list.err tests/qapi-schema/bad-if-list.json+5 -41 reply
12/19qapi: Fix missing 'if' checks in struct, union, alternate 'data'scripts/qapi/common.py tests/qapi-schema/alternate-branch-if-invalid.err tests/qapi-schema/alternate-branch-if-invalid.exit +10 more+9 -601 reply
13/19qapi: Normalize 'if' in check_exprs(), like other sugarscripts/qapi/common.py+15 -112 replies
14/19qapi: Simplify check_keys()scripts/qapi/common.py+8 -111 reply
15/19qapi: Clean up around check_known_keys()scripts/qapi/common.py+4 -41 reply
16/19qapi: Delete useless check_exprs() code for simple union kindscripts/qapi/common.py+2 -371 reply
17/19qapi: Fix to .check() empty structs just oncescripts/qapi/common.py+1 -11 reply
18/19qapi: Fix excessive QAPISchemaEntity.check() recursionscripts/qapi/common.py+52 -222 replies
19/19qapi: Assert .visit() and .check_clash() run only after .check()scripts/qapi/common.py+10 -11 reply

Reviews trailers per patch

All 19 patches have a Reviewed-by or Acked-by.

PatchEric Blake
1/19R-b
2/19R-b
3/19R-b
4/19R-b
5/19R-b
6/19R-b
7/19R-b
8/19R-b
9/19R-b
10/19R-b
11/19R-b
12/19R-b
13/19R-b
14/19R-b
15/19R-b
16/19R-b
17/19R-b
18/19R-b
19/19R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [Qemu-devel] [PATCH 00/19] qapi: Frontend fixes and cleanups

Here's the next batch of qapi patches, based on my "[PATCH v3 00/16]
qapi: Schema language cleanups & doc improvements". There's more in the pipeline.

Based-on: <[email protected]>

Markus Armbruster (19):
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                  |   4 +-
 scripts/qapi/common.py                        | 233 +++++++++---------
 tests/Makefile.include                        |   9 +-
 .../alternate-branch-if-invalid.err           |   1 +
 ....exit => alternate-branch-if-invalid.exit} |   0
 .../alternate-branch-if-invalid.json          |   3 +
 ...ta.out => alternate-branch-if-invalid.out} |   0
 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/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-int-member.err         |   2 +-
 tests/qapi-schema/escape-outside-string.err   |   1 +
 tests/qapi-schema/features-if-invalid.err     |   1 +
 ...rmat-err.exit => features-if-invalid.exit} |   0
 tests/qapi-schema/features-if-invalid.json    |   4 +
 ...format-err.out => features-if-invalid.out} |   0
 .../flat-union-discriminator-bad-name.err     |   1 +
 .../flat-union-discriminator-bad-name.exit    |   1 +
 .../flat-union-discriminator-bad-name.json    |  11 +
 .../flat-union-discriminator-bad-name.out     |   0
 .../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 +
 tests/qapi-schema/funny-word.exit             |   1 +
 tests/qapi-schema/funny-word.json             |   1 +
 tests/qapi-schema/funny-word.out              |   0
 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-unknown.err          |   1 +
 tests/qapi-schema/pragma-unknown.exit         |   1 +
 tests/qapi-schema/pragma-unknown.json         |   1 +
 tests/qapi-schema/pragma-unknown.out          |   0
 tests/qapi-schema/quoted-structural-chars.err |   2 +-
 .../qapi-schema/struct-member-if-invalid.err  |   1 +
 .../qapi-schema/struct-member-if-invalid.exit |   1 +
 .../qapi-schema/struct-member-if-invalid.json |   3 +
 .../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/union-base-empty.err        |   2 +-
 tests/qapi-schema/union-branch-if-invalid.err |   1 +
 .../qapi-schema/union-branch-if-invalid.exit  |   1 +
 .../qapi-schema/union-branch-if-invalid.json  |   6 +
 tests/qapi-schema/union-branch-if-invalid.out |   0
 65 files changed, 202 insertions(+), 157 deletions(-)
 create mode 100644 tests/qapi-schema/alternate-branch-if-invalid.err
 rename tests/qapi-schema/{double-data.exit => alternate-branch-if-invalid.exit} (100%)
 create mode 100644 tests/qapi-schema/alternate-branch-if-invalid.json
 rename tests/qapi-schema/{double-data.out => alternate-branch-if-invalid.out} (100%)
 delete mode 100644 tests/qapi-schema/double-data.err
 delete mode 100644 tests/qapi-schema/double-data.json
 create mode 100644 tests/qapi-schema/escape-outside-string.err
 create mode 100644 tests/qapi-schema/features-if-invalid.err
 rename tests/qapi-schema/{include-format-err.exit => features-if-invalid.exit} (100%)
 create mode 100644 tests/qapi-schema/features-if-invalid.json
 rename tests/qapi-schema/{include-format-err.out => features-if-invalid.out} (100%)
 create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.err
 create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.exit
 create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.json
 create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.out
 create mode 100644 tests/qapi-schema/funny-word.err
 create mode 100644 tests/qapi-schema/funny-word.exit
 create mode 100644 tests/qapi-schema/funny-word.json
 create mode 100644 tests/qapi-schema/funny-word.out
 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
 create mode 100644 tests/qapi-schema/pragma-unknown.exit
 create mode 100644 tests/qapi-schema/pragma-unknown.json
 create mode 100644 tests/qapi-schema/pragma-unknown.out
 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
 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
Signature · 1 line
2.21.0