Skip to contentSkip to conversation

qapi: Cleanups and test speedup

PATCH New Markus Armbruster 1 participant 8 messages Oct 18, 2019 Kbuild

lore
Share & tools
lore
#0 lore raw

v2 cover qapi: Cleanups and test speedup

v2:
* PATCH 4,6
- Commit message improved [Eric]
* PATCH 6
- Makefiles updated [Kevin]
- Import statements fixed

Markus Armbruster (7):
qapi: Don't suppress doc generation without pragma doc-required
qapi: Store pragma state in QAPISourceInfo, not global state
qapi: Eliminate accidental global frontend state
qapi: Speed up frontend tests
qapi: Move gen_enum(), gen_enum_lookup() back to qapi/types.py
qapi: Split up scripts/qapi/common.py
qapi: Clear scripts/qapi/doc.py executable bits again

 Makefile                                      |   13 +-
 scripts/qapi-gen.py                           |   10 +-
 scripts/qapi/commands.py                      |    1 +
 scripts/qapi/common.py                        | 2377 -----------------
 scripts/qapi/doc.py                           |   10 +-
 scripts/qapi/error.py                         |   42 +
 scripts/qapi/events.py                        |    3 +
 scripts/qapi/expr.py                          |  377 +++
 scripts/qapi/gen.py                           |  290 ++
 scripts/qapi/introspect.py                    |    5 +
 scripts/qapi/parser.py                        |  569 ++++
 scripts/qapi/schema.py                        | 1042 ++++++++
 scripts/qapi/source.py                        |   67 +
 scripts/qapi/types.py                         |   61 +
 scripts/qapi/visit.py                         |    2 +
 tests/Makefile.include                        |   30 +-
 tests/qapi-schema/allow-preconfig-test.err    |    4 +-
 tests/qapi-schema/allow-preconfig-test.exit   |    1 -
 tests/qapi-schema/alternate-any.err           |    4 +-
 tests/qapi-schema/alternate-any.exit          |    1 -
 tests/qapi-schema/alternate-array.err         |    4 +-
 tests/qapi-schema/alternate-array.exit        |    1 -
 tests/qapi-schema/alternate-base.err          |    4 +-
 tests/qapi-schema/alternate-base.exit         |    1 -
 .../alternate-branch-if-invalid.err           |    4 +-
 .../alternate-branch-if-invalid.exit          |    1 -
 tests/qapi-schema/alternate-clash.err         |    4 +-
 tests/qapi-schema/alternate-clash.exit        |    1 -
 .../alternate-conflict-bool-string.err        |    4 +-
 .../alternate-conflict-bool-string.exit       |    1 -
 tests/qapi-schema/alternate-conflict-dict.err |    4 +-
 .../qapi-schema/alternate-conflict-dict.exit  |    1 -
 .../alternate-conflict-enum-bool.err          |    4 +-
 .../alternate-conflict-enum-bool.exit         |    1 -
 .../alternate-conflict-enum-int.err           |    4 +-
 .../alternate-conflict-enum-int.exit          |    1 -
 .../alternate-conflict-num-string.err         |    4 +-
 .../alternate-conflict-num-string.exit        |    1 -
 .../qapi-schema/alternate-conflict-string.err |    4 +-
 .../alternate-conflict-string.exit            |    1 -
 tests/qapi-schema/alternate-empty.err         |    4 +-
 tests/qapi-schema/alternate-empty.exit        |    1 -
 tests/qapi-schema/alternate-invalid-dict.err  |    4 +-
 tests/qapi-schema/alternate-invalid-dict.exit |    1 -
 tests/qapi-schema/alternate-nested.err        |    4 +-
 tests/qapi-schema/alternate-nested.exit       |    1 -
 tests/qapi-schema/alternate-unknown.err       |    4 +-
 tests/qapi-schema/alternate-unknown.exit      |    1 -
 tests/qapi-schema/args-alternate.err          |    4 +-
 tests/qapi-schema/args-alternate.exit         |    1 -
 tests/qapi-schema/args-any.err                |    4 +-
 tests/qapi-schema/args-any.exit               |    1 -
 tests/qapi-schema/args-array-empty.err        |    4 +-
 tests/qapi-schema/args-array-empty.exit       |    1 -
 tests/qapi-schema/args-array-unknown.err      |    4 +-
 tests/qapi-schema/args-array-unknown.exit     |    1 -
 tests/qapi-schema/args-bad-boxed.err          |    4 +-
 tests/qapi-schema/args-bad-boxed.exit         |    1 -
 tests/qapi-schema/args-boxed-anon.err         |    4 +-
 tests/qapi-schema/args-boxed-anon.exit        |    1 -
 tests/qapi-schema/args-boxed-string.err       |    4 +-
 tests/qapi-schema/args-boxed-string.exit      |    1 -
 tests/qapi-schema/args-int.err                |    4 +-
 tests/qapi-schema/args-int.exit               |    1 -
 tests/qapi-schema/args-invalid.err            |    4 +-
 tests/qapi-schema/args-invalid.exit           |    1 -
 tests/qapi-schema/args-member-array-bad.err   |    4 +-
 tests/qapi-schema/args-member-array-bad.exit  |    1 -
 tests/qapi-schema/args-member-case.err        |    4 +-
 tests/qapi-schema/args-member-case.exit       |    1 -
 tests/qapi-schema/args-member-unknown.err     |    4 +-
 tests/qapi-schema/args-member-unknown.exit    |    1 -
 tests/qapi-schema/args-name-clash.err         |    4 +-
 tests/qapi-schema/args-name-clash.exit        |    1 -
 tests/qapi-schema/args-union.err              |    4 +-
 tests/qapi-schema/args-union.exit             |    1 -
 tests/qapi-schema/args-unknown.err            |    4 +-
 tests/qapi-schema/args-unknown.exit           |    1 -
 tests/qapi-schema/bad-base.err                |    4 +-
 tests/qapi-schema/bad-base.exit               |    1 -
 tests/qapi-schema/bad-data.err                |    4 +-
 tests/qapi-schema/bad-data.exit               |    1 -
 tests/qapi-schema/bad-ident.err               |    4 +-
 tests/qapi-schema/bad-ident.exit              |    1 -
 tests/qapi-schema/bad-if-empty-list.err       |    4 +-
 tests/qapi-schema/bad-if-empty-list.exit      |    1 -
 tests/qapi-schema/bad-if-empty.err            |    4 +-
 tests/qapi-schema/bad-if-empty.exit           |    1 -
 tests/qapi-schema/bad-if-list.err             |    4 +-
 tests/qapi-schema/bad-if-list.exit            |    1 -
 tests/qapi-schema/bad-if.err                  |    4 +-
 tests/qapi-schema/bad-if.exit                 |    1 -
 tests/qapi-schema/bad-type-bool.err           |    2 +-
 tests/qapi-schema/bad-type-bool.exit          |    1 -
 tests/qapi-schema/bad-type-dict.err           |    2 +-
 tests/qapi-schema/bad-type-dict.exit          |    1 -
 tests/qapi-schema/bad-type-int.err            |    2 +-
 tests/qapi-schema/bad-type-int.exit           |    1 -
 tests/qapi-schema/base-cycle-direct.err       |    4 +-
 tests/qapi-schema/base-cycle-direct.exit      |    1 -
 tests/qapi-schema/base-cycle-indirect.err     |    4 +-
 tests/qapi-schema/base-cycle-indirect.exit    |    1 -
 tests/qapi-schema/command-int.err             |    4 +-
 tests/qapi-schema/command-int.exit            |    1 -
 tests/qapi-schema/comments.exit               |    1 -
 .../qapi-schema/doc-bad-alternate-member.err  |    2 +-
 .../qapi-schema/doc-bad-alternate-member.exit |    1 -
 tests/qapi-schema/doc-bad-command-arg.err     |    2 +-
 tests/qapi-schema/doc-bad-command-arg.exit    |    1 -
 tests/qapi-schema/doc-bad-section.exit        |    1 -
 tests/qapi-schema/doc-bad-symbol.err          |    4 +-
 tests/qapi-schema/doc-bad-symbol.exit         |    1 -
 tests/qapi-schema/doc-bad-union-member.err    |    2 +-
 tests/qapi-schema/doc-bad-union-member.exit   |    1 -
 tests/qapi-schema/doc-before-include.err      |    2 +-
 tests/qapi-schema/doc-before-include.exit     |    1 -
 tests/qapi-schema/doc-before-pragma.err       |    2 +-
 tests/qapi-schema/doc-before-pragma.exit      |    1 -
 tests/qapi-schema/doc-duplicated-arg.err      |    2 +-
 tests/qapi-schema/doc-duplicated-arg.exit     |    1 -
 tests/qapi-schema/doc-duplicated-return.err   |    2 +-
 tests/qapi-schema/doc-duplicated-return.exit  |    1 -
 tests/qapi-schema/doc-duplicated-since.err    |    2 +-
 tests/qapi-schema/doc-duplicated-since.exit   |    1 -
 tests/qapi-schema/doc-empty-arg.err           |    2 +-
 tests/qapi-schema/doc-empty-arg.exit          |    1 -
 tests/qapi-schema/doc-empty-section.err       |    2 +-
 tests/qapi-schema/doc-empty-section.exit      |    1 -
 tests/qapi-schema/doc-empty-symbol.err        |    2 +-
 tests/qapi-schema/doc-empty-symbol.exit       |    1 -
 tests/qapi-schema/doc-good.exit               |    1 -
 tests/qapi-schema/doc-interleaved-section.err |    2 +-
 .../qapi-schema/doc-interleaved-section.exit  |    1 -
 tests/qapi-schema/doc-invalid-end.err         |    2 +-
 tests/qapi-schema/doc-invalid-end.exit        |    1 -
 tests/qapi-schema/doc-invalid-end2.err        |    2 +-
 tests/qapi-schema/doc-invalid-end2.exit       |    1 -
 tests/qapi-schema/doc-invalid-return.err      |    2 +-
 tests/qapi-schema/doc-invalid-return.exit     |    1 -
 tests/qapi-schema/doc-invalid-section.err     |    2 +-
 tests/qapi-schema/doc-invalid-section.exit    |    1 -
 tests/qapi-schema/doc-invalid-start.err       |    2 +-
 tests/qapi-schema/doc-invalid-start.exit      |    1 -
 tests/qapi-schema/doc-missing-colon.err       |    2 +-
 tests/qapi-schema/doc-missing-colon.exit      |    1 -
 tests/qapi-schema/doc-missing-expr.err        |    2 +-
 tests/qapi-schema/doc-missing-expr.exit       |    1 -
 tests/qapi-schema/doc-missing-space.err       |    2 +-
 tests/qapi-schema/doc-missing-space.exit      |    1 -
 tests/qapi-schema/doc-missing.err             |    4 +-
 tests/qapi-schema/doc-missing.exit            |    1 -
 tests/qapi-schema/doc-no-symbol.err           |    2 +-
 tests/qapi-schema/doc-no-symbol.exit          |    1 -
 tests/qapi-schema/double-type.err             |    4 +-
 tests/qapi-schema/double-type.exit            |    1 -
 tests/qapi-schema/duplicate-key.err           |    2 +-
 tests/qapi-schema/duplicate-key.exit          |    1 -
 tests/qapi-schema/empty.exit                  |    1 -
 tests/qapi-schema/enum-bad-member.err         |    4 +-
 tests/qapi-schema/enum-bad-member.exit        |    1 -
 tests/qapi-schema/enum-bad-name.err           |    4 +-
 tests/qapi-schema/enum-bad-name.exit          |    1 -
 tests/qapi-schema/enum-bad-prefix.err         |    4 +-
 tests/qapi-schema/enum-bad-prefix.exit        |    1 -
 tests/qapi-schema/enum-clash-member.err       |    4 +-
 tests/qapi-schema/enum-clash-member.exit      |    1 -
 .../qapi-schema/enum-dict-member-unknown.err  |    4 +-
 .../qapi-schema/enum-dict-member-unknown.exit |    1 -
 tests/qapi-schema/enum-if-invalid.err         |    4 +-
 tests/qapi-schema/enum-if-invalid.exit        |    1 -
 tests/qapi-schema/enum-int-member.err         |    2 +-
 tests/qapi-schema/enum-int-member.exit        |    1 -
 tests/qapi-schema/enum-member-case.err        |    4 +-
 tests/qapi-schema/enum-member-case.exit       |    1 -
 tests/qapi-schema/enum-missing-data.err       |    4 +-
 tests/qapi-schema/enum-missing-data.exit      |    1 -
 tests/qapi-schema/enum-wrong-data.err         |    4 +-
 tests/qapi-schema/enum-wrong-data.exit        |    1 -
 tests/qapi-schema/escape-outside-string.err   |    2 +-
 tests/qapi-schema/event-boxed-empty.err       |    4 +-
 tests/qapi-schema/event-boxed-empty.exit      |    1 -
 tests/qapi-schema/event-case.exit             |    1 -
 .../qapi-schema/event-member-invalid-dict.err |    4 +-
 .../event-member-invalid-dict.exit            |    1 -
 tests/qapi-schema/event-nest-struct.err       |    4 +-
 tests/qapi-schema/event-nest-struct.exit      |    1 -
 tests/qapi-schema/features-bad-type.err       |    4 +-
 tests/qapi-schema/features-bad-type.exit      |    1 -
 tests/qapi-schema/features-duplicate-name.err |    4 +-
 .../qapi-schema/features-duplicate-name.exit  |    1 -
 tests/qapi-schema/features-if-invalid.err     |    4 +-
 tests/qapi-schema/features-if-invalid.exit    |    1 -
 tests/qapi-schema/features-missing-name.err   |    4 +-
 tests/qapi-schema/features-missing-name.exit  |    1 -
 tests/qapi-schema/features-name-bad-type.err  |    4 +-
 tests/qapi-schema/features-name-bad-type.exit |    1 -
 tests/qapi-schema/features-no-list.err        |    4 +-
 tests/qapi-schema/features-no-list.exit       |    1 -
 tests/qapi-schema/features-unknown-key.err    |    4 +-
 tests/qapi-schema/features-unknown-key.exit   |    1 -
 tests/qapi-schema/flat-union-array-branch.err |    4 +-
 .../qapi-schema/flat-union-array-branch.exit  |    1 -
 tests/qapi-schema/flat-union-bad-base.err     |    4 +-
 tests/qapi-schema/flat-union-bad-base.exit    |    1 -
 .../flat-union-bad-discriminator.err          |    4 +-
 .../flat-union-bad-discriminator.exit         |    1 -
 tests/qapi-schema/flat-union-base-any.err     |    4 +-
 tests/qapi-schema/flat-union-base-any.exit    |    1 -
 tests/qapi-schema/flat-union-base-union.err   |    4 +-
 tests/qapi-schema/flat-union-base-union.exit  |    1 -
 tests/qapi-schema/flat-union-clash-member.err |    4 +-
 .../qapi-schema/flat-union-clash-member.exit  |    1 -
 .../flat-union-discriminator-bad-name.err     |    4 +-
 .../flat-union-discriminator-bad-name.exit    |    1 -
 tests/qapi-schema/flat-union-empty.err        |    4 +-
 tests/qapi-schema/flat-union-empty.exit       |    1 -
 .../flat-union-inline-invalid-dict.err        |    4 +-
 .../flat-union-inline-invalid-dict.exit       |    1 -
 tests/qapi-schema/flat-union-inline.err       |    4 +-
 tests/qapi-schema/flat-union-inline.exit      |    1 -
 tests/qapi-schema/flat-union-int-branch.err   |    4 +-
 tests/qapi-schema/flat-union-int-branch.exit  |    1 -
 .../flat-union-invalid-branch-key.err         |    4 +-
 .../flat-union-invalid-branch-key.exit        |    1 -
 .../flat-union-invalid-discriminator.err      |    4 +-
 .../flat-union-invalid-discriminator.exit     |    1 -
 .../flat-union-invalid-if-discriminator.err   |    4 +-
 .../flat-union-invalid-if-discriminator.exit  |    1 -
 tests/qapi-schema/flat-union-no-base.err      |    4 +-
 tests/qapi-schema/flat-union-no-base.exit     |    1 -
 .../flat-union-optional-discriminator.err     |    4 +-
 .../flat-union-optional-discriminator.exit    |    1 -
 .../flat-union-string-discriminator.err       |    4 +-
 .../flat-union-string-discriminator.exit      |    1 -
 tests/qapi-schema/funny-char.err              |    2 +-
 tests/qapi-schema/funny-char.exit             |    1 -
 tests/qapi-schema/funny-word.err              |    2 +-
 tests/qapi-schema/funny-word.exit             |    1 -
 tests/qapi-schema/ident-with-escape.err       |    2 +-
 tests/qapi-schema/ident-with-escape.exit      |    1 -
 tests/qapi-schema/include-before-err.err      |    2 +-
 tests/qapi-schema/include-before-err.exit     |    1 -
 tests/qapi-schema/include-cycle.err           |    6 +-
 tests/qapi-schema/include-cycle.exit          |    1 -
 tests/qapi-schema/include-extra-junk.err      |    2 +-
 tests/qapi-schema/include-extra-junk.exit     |    1 -
 tests/qapi-schema/include-nested-err.err      |    4 +-
 tests/qapi-schema/include-nested-err.exit     |    1 -
 tests/qapi-schema/include-no-file.err         |    2 +-
 tests/qapi-schema/include-no-file.exit        |    1 -
 tests/qapi-schema/include-non-file.err        |    2 +-
 tests/qapi-schema/include-non-file.exit       |    1 -
 tests/qapi-schema/include-repetition.exit     |    1 -
 tests/qapi-schema/include-self-cycle.err      |    2 +-
 tests/qapi-schema/include-self-cycle.exit     |    1 -
 tests/qapi-schema/include-simple.exit         |    1 -
 tests/qapi-schema/indented-expr.exit          |    1 -
 tests/qapi-schema/leading-comma-list.err      |    2 +-
 tests/qapi-schema/leading-comma-list.exit     |    1 -
 tests/qapi-schema/leading-comma-object.err    |    2 +-
 tests/qapi-schema/leading-comma-object.exit   |    1 -
 tests/qapi-schema/missing-colon.err           |    2 +-
 tests/qapi-schema/missing-colon.exit          |    1 -
 tests/qapi-schema/missing-comma-list.err      |    2 +-
 tests/qapi-schema/missing-comma-list.exit     |    1 -
 tests/qapi-schema/missing-comma-object.err    |    2 +-
 tests/qapi-schema/missing-comma-object.exit   |    1 -
 tests/qapi-schema/missing-type.err            |    2 +-
 tests/qapi-schema/missing-type.exit           |    1 -
 .../nested-struct-data-invalid-dict.err       |    4 +-
 .../nested-struct-data-invalid-dict.exit      |    1 -
 tests/qapi-schema/nested-struct-data.err      |    4 +-
 tests/qapi-schema/nested-struct-data.exit     |    1 -
 tests/qapi-schema/non-objects.err             |    2 +-
 tests/qapi-schema/non-objects.exit            |    1 -
 tests/qapi-schema/oob-test.err                |    4 +-
 tests/qapi-schema/oob-test.exit               |    1 -
 .../qapi-schema/pragma-doc-required-crap.err  |    2 +-
 .../qapi-schema/pragma-doc-required-crap.exit |    1 -
 tests/qapi-schema/pragma-extra-junk.err       |    2 +-
 tests/qapi-schema/pragma-extra-junk.exit      |    1 -
 .../pragma-name-case-whitelist-crap.err       |    2 +-
 .../pragma-name-case-whitelist-crap.exit      |    1 -
 tests/qapi-schema/pragma-non-dict.err         |    2 +-
 tests/qapi-schema/pragma-non-dict.exit        |    1 -
 .../pragma-returns-whitelist-crap.err         |    2 +-
 .../pragma-returns-whitelist-crap.exit        |    1 -
 tests/qapi-schema/pragma-unknown.err          |    2 +-
 tests/qapi-schema/pragma-unknown.exit         |    1 -
 tests/qapi-schema/qapi-schema-test.exit       |    1 -
 tests/qapi-schema/quoted-structural-chars.err |    2 +-
 .../qapi-schema/quoted-structural-chars.exit  |    1 -
 tests/qapi-schema/redefined-builtin.err       |    4 +-
 tests/qapi-schema/redefined-builtin.exit      |    1 -
 tests/qapi-schema/redefined-command.err       |    8 +-
 tests/qapi-schema/redefined-command.exit      |    1 -
 tests/qapi-schema/redefined-event.err         |    8 +-
 tests/qapi-schema/redefined-event.exit        |    1 -
 tests/qapi-schema/redefined-type.err          |    8 +-
 tests/qapi-schema/redefined-type.exit         |    1 -
 tests/qapi-schema/reserved-command-q.err      |    4 +-
 tests/qapi-schema/reserved-command-q.exit     |    1 -
 tests/qapi-schema/reserved-enum-q.err         |    4 +-
 tests/qapi-schema/reserved-enum-q.exit        |    1 -
 tests/qapi-schema/reserved-member-has.err     |    4 +-
 tests/qapi-schema/reserved-member-has.exit    |    1 -
 tests/qapi-schema/reserved-member-q.err       |    4 +-
 tests/qapi-schema/reserved-member-q.exit      |    1 -
 tests/qapi-schema/reserved-member-u.err       |    4 +-
 tests/qapi-schema/reserved-member-u.exit      |    1 -
 .../reserved-member-underscore.err            |    4 +-
 .../reserved-member-underscore.exit           |    1 -
 tests/qapi-schema/reserved-type-kind.err      |    4 +-
 tests/qapi-schema/reserved-type-kind.exit     |    1 -
 tests/qapi-schema/reserved-type-list.err      |    4 +-
 tests/qapi-schema/reserved-type-list.exit     |    1 -
 tests/qapi-schema/returns-alternate.err       |    4 +-
 tests/qapi-schema/returns-alternate.exit      |    1 -
 tests/qapi-schema/returns-array-bad.err       |    4 +-
 tests/qapi-schema/returns-array-bad.exit      |    1 -
 tests/qapi-schema/returns-dict.err            |    4 +-
 tests/qapi-schema/returns-dict.exit           |    1 -
 tests/qapi-schema/returns-unknown.err         |    4 +-
 tests/qapi-schema/returns-unknown.exit        |    1 -
 tests/qapi-schema/returns-whitelist.err       |    4 +-
 tests/qapi-schema/returns-whitelist.exit      |    1 -
 tests/qapi-schema/string-code-point-127.err   |    2 +-
 tests/qapi-schema/string-code-point-127.exit  |    1 -
 tests/qapi-schema/string-code-point-31.err    |    2 +-
 tests/qapi-schema/string-code-point-31.exit   |    1 -
 tests/qapi-schema/struct-base-clash-deep.err  |    4 +-
 tests/qapi-schema/struct-base-clash-deep.exit |    1 -
 tests/qapi-schema/struct-base-clash.err       |    4 +-
 tests/qapi-schema/struct-base-clash.exit      |    1 -
 tests/qapi-schema/struct-data-invalid.err     |    4 +-
 tests/qapi-schema/struct-data-invalid.exit    |    1 -
 .../qapi-schema/struct-member-if-invalid.err  |    4 +-
 .../qapi-schema/struct-member-if-invalid.exit |    1 -
 .../struct-member-invalid-dict.err            |    4 +-
 .../struct-member-invalid-dict.exit           |    1 -
 tests/qapi-schema/struct-member-invalid.err   |    4 +-
 tests/qapi-schema/struct-member-invalid.exit  |    1 -
 tests/qapi-schema/test-qapi.py                |  125 +-
 tests/qapi-schema/trailing-comma-list.err     |    2 +-
 tests/qapi-schema/trailing-comma-list.exit    |    1 -
 tests/qapi-schema/trailing-comma-object.err   |    2 +-
 tests/qapi-schema/trailing-comma-object.exit  |    1 -
 tests/qapi-schema/type-bypass-bad-gen.err     |    4 +-
 tests/qapi-schema/type-bypass-bad-gen.exit    |    1 -
 tests/qapi-schema/unclosed-list.err           |    2 +-
 tests/qapi-schema/unclosed-list.exit          |    1 -
 tests/qapi-schema/unclosed-object.err         |    2 +-
 tests/qapi-schema/unclosed-object.exit        |    1 -
 tests/qapi-schema/unclosed-string.err         |    2 +-
 tests/qapi-schema/unclosed-string.exit        |    1 -
 tests/qapi-schema/union-base-empty.err        |    4 +-
 tests/qapi-schema/union-base-empty.exit       |    1 -
 .../union-base-no-discriminator.err           |    4 +-
 .../union-base-no-discriminator.exit          |    1 -
 tests/qapi-schema/union-branch-case.err       |    4 +-
 tests/qapi-schema/union-branch-case.exit      |    1 -
 tests/qapi-schema/union-branch-if-invalid.err |    4 +-
 .../qapi-schema/union-branch-if-invalid.exit  |    1 -
 .../qapi-schema/union-branch-invalid-dict.err |    4 +-
 .../union-branch-invalid-dict.exit            |    1 -
 tests/qapi-schema/union-clash-branches.err    |    4 +-
 tests/qapi-schema/union-clash-branches.exit   |    1 -
 tests/qapi-schema/union-empty.err             |    4 +-
 tests/qapi-schema/union-empty.exit            |    1 -
 tests/qapi-schema/union-invalid-base.err      |    4 +-
 tests/qapi-schema/union-invalid-base.exit     |    1 -
 tests/qapi-schema/union-optional-branch.err   |    4 +-
 tests/qapi-schema/union-optional-branch.exit  |    1 -
 tests/qapi-schema/union-unknown.err           |    4 +-
 tests/qapi-schema/union-unknown.exit          |    1 -
 tests/qapi-schema/unknown-escape.err          |    2 +-
 tests/qapi-schema/unknown-escape.exit         |    1 -
 tests/qapi-schema/unknown-expr-key.err        |    4 +-
 tests/qapi-schema/unknown-expr-key.exit       |    1 -
 379 files changed, 2908 insertions(+), 2909 deletions(-)
 mode change 100755 => 100644 scripts/qapi/doc.py
 create mode 100644 scripts/qapi/error.py
 create mode 100644 scripts/qapi/expr.py
 create mode 100644 scripts/qapi/gen.py
 create mode 100644 scripts/qapi/parser.py
 create mode 100644 scripts/qapi/schema.py
 create mode 100644 scripts/qapi/source.py
 delete mode 100644 tests/qapi-schema/allow-preconfig-test.exit
 delete mode 100644 tests/qapi-schema/alternate-any.exit
 delete mode 100644 tests/qapi-schema/alternate-array.exit
 delete mode 100644 tests/qapi-schema/alternate-base.exit
 delete mode 100644 tests/qapi-schema/alternate-branch-if-invalid.exit
 delete mode 100644 tests/qapi-schema/alternate-clash.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-bool-string.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-dict.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-enum-bool.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-enum-int.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-num-string.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-string.exit
 delete mode 100644 tests/qapi-schema/alternate-empty.exit
 delete mode 100644 tests/qapi-schema/alternate-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/alternate-nested.exit
 delete mode 100644 tests/qapi-schema/alternate-unknown.exit
 delete mode 100644 tests/qapi-schema/args-alternate.exit
 delete mode 100644 tests/qapi-schema/args-any.exit
 delete mode 100644 tests/qapi-schema/args-array-empty.exit
 delete mode 100644 tests/qapi-schema/args-array-unknown.exit
 delete mode 100644 tests/qapi-schema/args-bad-boxed.exit
 delete mode 100644 tests/qapi-schema/args-boxed-anon.exit
 delete mode 100644 tests/qapi-schema/args-boxed-string.exit
 delete mode 100644 tests/qapi-schema/args-int.exit
 delete mode 100644 tests/qapi-schema/args-invalid.exit
 delete mode 100644 tests/qapi-schema/args-member-array-bad.exit
 delete mode 100644 tests/qapi-schema/args-member-case.exit
 delete mode 100644 tests/qapi-schema/args-member-unknown.exit
 delete mode 100644 tests/qapi-schema/args-name-clash.exit
 delete mode 100644 tests/qapi-schema/args-union.exit
 delete mode 100644 tests/qapi-schema/args-unknown.exit
 delete mode 100644 tests/qapi-schema/bad-base.exit
 delete mode 100644 tests/qapi-schema/bad-data.exit
 delete mode 100644 tests/qapi-schema/bad-ident.exit
 delete mode 100644 tests/qapi-schema/bad-if-empty-list.exit
 delete mode 100644 tests/qapi-schema/bad-if-empty.exit
 delete mode 100644 tests/qapi-schema/bad-if-list.exit
 delete mode 100644 tests/qapi-schema/bad-if.exit
 delete mode 100644 tests/qapi-schema/bad-type-bool.exit
 delete mode 100644 tests/qapi-schema/bad-type-dict.exit
 delete mode 100644 tests/qapi-schema/bad-type-int.exit
 delete mode 100644 tests/qapi-schema/base-cycle-direct.exit
 delete mode 100644 tests/qapi-schema/base-cycle-indirect.exit
 delete mode 100644 tests/qapi-schema/command-int.exit
 delete mode 100644 tests/qapi-schema/comments.exit
 delete mode 100644 tests/qapi-schema/doc-bad-alternate-member.exit
 delete mode 100644 tests/qapi-schema/doc-bad-command-arg.exit
 delete mode 100644 tests/qapi-schema/doc-bad-section.exit
 delete mode 100644 tests/qapi-schema/doc-bad-symbol.exit
 delete mode 100644 tests/qapi-schema/doc-bad-union-member.exit
 delete mode 100644 tests/qapi-schema/doc-before-include.exit
 delete mode 100644 tests/qapi-schema/doc-before-pragma.exit
 delete mode 100644 tests/qapi-schema/doc-duplicated-arg.exit
 delete mode 100644 tests/qapi-schema/doc-duplicated-return.exit
 delete mode 100644 tests/qapi-schema/doc-duplicated-since.exit
 delete mode 100644 tests/qapi-schema/doc-empty-arg.exit
 delete mode 100644 tests/qapi-schema/doc-empty-section.exit
 delete mode 100644 tests/qapi-schema/doc-empty-symbol.exit
 delete mode 100644 tests/qapi-schema/doc-good.exit
 delete mode 100644 tests/qapi-schema/doc-interleaved-section.exit
 delete mode 100644 tests/qapi-schema/doc-invalid-end.exit
 delete mode 100644 tests/qapi-schema/doc-invalid-end2.exit
 delete mode 100644 tests/qapi-schema/doc-invalid-return.exit
 delete mode 100644 tests/qapi-schema/doc-invalid-section.exit
 delete mode 100644 tests/qapi-schema/doc-invalid-start.exit
 delete mode 100644 tests/qapi-schema/doc-missing-colon.exit
 delete mode 100644 tests/qapi-schema/doc-missing-expr.exit
 delete mode 100644 tests/qapi-schema/doc-missing-space.exit
 delete mode 100644 tests/qapi-schema/doc-missing.exit
 delete mode 100644 tests/qapi-schema/doc-no-symbol.exit
 delete mode 100644 tests/qapi-schema/double-type.exit
 delete mode 100644 tests/qapi-schema/duplicate-key.exit
 delete mode 100644 tests/qapi-schema/empty.exit
 delete mode 100644 tests/qapi-schema/enum-bad-member.exit
 delete mode 100644 tests/qapi-schema/enum-bad-name.exit
 delete mode 100644 tests/qapi-schema/enum-bad-prefix.exit
 delete mode 100644 tests/qapi-schema/enum-clash-member.exit
 delete mode 100644 tests/qapi-schema/enum-dict-member-unknown.exit
 delete mode 100644 tests/qapi-schema/enum-if-invalid.exit
 delete mode 100644 tests/qapi-schema/enum-int-member.exit
 delete mode 100644 tests/qapi-schema/enum-member-case.exit
 delete mode 100644 tests/qapi-schema/enum-missing-data.exit
 delete mode 100644 tests/qapi-schema/enum-wrong-data.exit
 delete mode 100644 tests/qapi-schema/event-boxed-empty.exit
 delete mode 100644 tests/qapi-schema/event-case.exit
 delete mode 100644 tests/qapi-schema/event-member-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/event-nest-struct.exit
 delete mode 100644 tests/qapi-schema/features-bad-type.exit
 delete mode 100644 tests/qapi-schema/features-duplicate-name.exit
 delete mode 100644 tests/qapi-schema/features-if-invalid.exit
 delete mode 100644 tests/qapi-schema/features-missing-name.exit
 delete mode 100644 tests/qapi-schema/features-name-bad-type.exit
 delete mode 100644 tests/qapi-schema/features-no-list.exit
 delete mode 100644 tests/qapi-schema/features-unknown-key.exit
 delete mode 100644 tests/qapi-schema/flat-union-array-branch.exit
 delete mode 100644 tests/qapi-schema/flat-union-bad-base.exit
 delete mode 100644 tests/qapi-schema/flat-union-bad-discriminator.exit
 delete mode 100644 tests/qapi-schema/flat-union-base-any.exit
 delete mode 100644 tests/qapi-schema/flat-union-base-union.exit
 delete mode 100644 tests/qapi-schema/flat-union-clash-member.exit
 delete mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.exit
 delete mode 100644 tests/qapi-schema/flat-union-empty.exit
 delete mode 100644 tests/qapi-schema/flat-union-inline-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/flat-union-inline.exit
 delete mode 100644 tests/qapi-schema/flat-union-int-branch.exit
 delete mode 100644 tests/qapi-schema/flat-union-invalid-branch-key.exit
 delete mode 100644 tests/qapi-schema/flat-union-invalid-discriminator.exit
 delete mode 100644 tests/qapi-schema/flat-union-invalid-if-discriminator.exit
 delete mode 100644 tests/qapi-schema/flat-union-no-base.exit
 delete mode 100644 tests/qapi-schema/flat-union-optional-discriminator.exit
 delete mode 100644 tests/qapi-schema/flat-union-string-discriminator.exit
 delete mode 100644 tests/qapi-schema/funny-char.exit
 delete mode 100644 tests/qapi-schema/funny-word.exit
 delete mode 100644 tests/qapi-schema/ident-with-escape.exit
 delete mode 100644 tests/qapi-schema/include-before-err.exit
 delete mode 100644 tests/qapi-schema/include-cycle.exit
 delete mode 100644 tests/qapi-schema/include-extra-junk.exit
 delete mode 100644 tests/qapi-schema/include-nested-err.exit
 delete mode 100644 tests/qapi-schema/include-no-file.exit
 delete mode 100644 tests/qapi-schema/include-non-file.exit
 delete mode 100644 tests/qapi-schema/include-repetition.exit
 delete mode 100644 tests/qapi-schema/include-self-cycle.exit
 delete mode 100644 tests/qapi-schema/include-simple.exit
 delete mode 100644 tests/qapi-schema/indented-expr.exit
 delete mode 100644 tests/qapi-schema/leading-comma-list.exit
 delete mode 100644 tests/qapi-schema/leading-comma-object.exit
 delete mode 100644 tests/qapi-schema/missing-colon.exit
 delete mode 100644 tests/qapi-schema/missing-comma-list.exit
 delete mode 100644 tests/qapi-schema/missing-comma-object.exit
 delete mode 100644 tests/qapi-schema/missing-type.exit
 delete mode 100644 tests/qapi-schema/nested-struct-data-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/nested-struct-data.exit
 delete mode 100644 tests/qapi-schema/non-objects.exit
 delete mode 100644 tests/qapi-schema/oob-test.exit
 delete mode 100644 tests/qapi-schema/pragma-doc-required-crap.exit
 delete mode 100644 tests/qapi-schema/pragma-extra-junk.exit
 delete mode 100644 tests/qapi-schema/pragma-name-case-whitelist-crap.exit
 delete mode 100644 tests/qapi-schema/pragma-non-dict.exit
 delete mode 100644 tests/qapi-schema/pragma-returns-whitelist-crap.exit
 delete mode 100644 tests/qapi-schema/pragma-unknown.exit
 delete mode 100644 tests/qapi-schema/qapi-schema-test.exit
 delete mode 100644 tests/qapi-schema/quoted-structural-chars.exit
 delete mode 100644 tests/qapi-schema/redefined-builtin.exit
 delete mode 100644 tests/qapi-schema/redefined-command.exit
 delete mode 100644 tests/qapi-schema/redefined-event.exit
 delete mode 100644 tests/qapi-schema/redefined-type.exit
 delete mode 100644 tests/qapi-schema/reserved-command-q.exit
 delete mode 100644 tests/qapi-schema/reserved-enum-q.exit
 delete mode 100644 tests/qapi-schema/reserved-member-has.exit
 delete mode 100644 tests/qapi-schema/reserved-member-q.exit
 delete mode 100644 tests/qapi-schema/reserved-member-u.exit
 delete mode 100644 tests/qapi-schema/reserved-member-underscore.exit
 delete mode 100644 tests/qapi-schema/reserved-type-kind.exit
 delete mode 100644 tests/qapi-schema/reserved-type-list.exit
 delete mode 100644 tests/qapi-schema/returns-alternate.exit
 delete mode 100644 tests/qapi-schema/returns-array-bad.exit
 delete mode 100644 tests/qapi-schema/returns-dict.exit
 delete mode 100644 tests/qapi-schema/returns-unknown.exit
 delete mode 100644 tests/qapi-schema/returns-whitelist.exit
 delete mode 100644 tests/qapi-schema/string-code-point-127.exit
 delete mode 100644 tests/qapi-schema/string-code-point-31.exit
 delete mode 100644 tests/qapi-schema/struct-base-clash-deep.exit
 delete mode 100644 tests/qapi-schema/struct-base-clash.exit
 delete mode 100644 tests/qapi-schema/struct-data-invalid.exit
 delete mode 100644 tests/qapi-schema/struct-member-if-invalid.exit
 delete mode 100644 tests/qapi-schema/struct-member-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/struct-member-invalid.exit
 mode change 100644 => 100755 tests/qapi-schema/test-qapi.py
 delete mode 100644 tests/qapi-schema/trailing-comma-list.exit
 delete mode 100644 tests/qapi-schema/trailing-comma-object.exit
 delete mode 100644 tests/qapi-schema/type-bypass-bad-gen.exit
 delete mode 100644 tests/qapi-schema/unclosed-list.exit
 delete mode 100644 tests/qapi-schema/unclosed-object.exit
 delete mode 100644 tests/qapi-schema/unclosed-string.exit
 delete mode 100644 tests/qapi-schema/union-base-empty.exit
 delete mode 100644 tests/qapi-schema/union-base-no-discriminator.exit
 delete mode 100644 tests/qapi-schema/union-branch-case.exit
 delete mode 100644 tests/qapi-schema/union-branch-if-invalid.exit
 delete mode 100644 tests/qapi-schema/union-branch-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/union-clash-branches.exit
 delete mode 100644 tests/qapi-schema/union-empty.exit
 delete mode 100644 tests/qapi-schema/union-invalid-base.exit
 delete mode 100644 tests/qapi-schema/union-optional-branch.exit
 delete mode 100644 tests/qapi-schema/union-unknown.exit
 delete mode 100644 tests/qapi-schema/unknown-escape.exit
 delete mode 100644 tests/qapi-schema/unknown-expr-key.exit
Signature · 1 line
2.21.0
#1 lore raw

PATCH v2 1/7 qapi: Don't suppress doc generation without pragma doc-required

Commit bc52d03ff5 "qapi: Make doc comments optional where we don't need them" made scripts/qapi2texi.py fail[*] unless the schema had pragma 'doc-required': true. The stated reason was inability to cope with incomplete documentation.

When commit fb0bc835e5 "qapi-gen: New common driver for code and doc generators" folded scripts/qapi2texi.py into scripts/qapi-gen.py, it turned the failure into silent suppression.

The doc generator can cope with incomplete documentation now. I don't know since when, or what the problem was, or even whether it ever existed.

Drop the silent suppression.

[*] The fail part was broken, fixed in commit e8ba07ea9a.

---
 scripts/qapi/doc.py    | 2 --
 tests/Makefile.include | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)
scripts/qapi/doc.py +0 -2
index 5fc0fc7e06..693cc4486b 100755
@@ -283,8 +283,6 @@ class QAPISchemaGenDocVisitor(qapi.common.QAPISchemaVisitor):
 
 
 def gen_doc(schema, output_dir, prefix):
-    if not qapi.common.doc_required:
-        return
     vis = QAPISchemaGenDocVisitor(prefix)
     vis.visit_begin(schema)
     for doc in schema.docs:
tests/Makefile.include +1 -0
index 3543451ed3..214fbd941c 100644
@@ -609,6 +609,7 @@ tests/test-qapi-gen-timestamp: \
 	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \
 		-o tests -p "test-" $<, \
 		"GEN","$(@:%-timestamp=%)")
+	@rm -f tests/test-qapi-doc.texi
 	@>$@
 
 tests/qapi-schema/doc-good.test.texi: $(SRC_PATH)/tests/qapi-schema/doc-good.json $(qapi-py)
Signature · 1 line
2.21.0
#2 lore raw

PATCH v2 2/7 qapi: Store pragma state in QAPISourceInfo, not global state

In reply to Markus Armbruster

The frontend can't be run more than once due to its global state. A future commit will want to do that.

Recent commit "qapi: Move context-sensitive checking to the proper place" got rid of many global variables already, but pragma state is still stored in global variables (that's why a pragma directive's scope is the complete schema).

Move the pragma state to QAPISourceInfo.

---
 scripts/qapi/common.py | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)
scripts/qapi/common.py +19 -17
index d6e00c80ea..5abab44302 100644
@@ -21,25 +21,28 @@ import string
 import sys
 from collections import OrderedDict
 
-# Are documentation comments required?
-doc_required = False
-
-# Whitelist of commands allowed to return a non-dictionary
-returns_whitelist = []
-
-# Whitelist of entities allowed to violate case conventions
-name_case_whitelist = []
-
 
 #
 # Parsing the schema into expressions
 #
 
+
+class QAPISchemaPragma(object):
+    def __init__(self):
+        # Are documentation comments required?
+        self.doc_required = False
+        # Whitelist of commands allowed to return a non-dictionary
+        self.returns_whitelist = []
+        # Whitelist of entities allowed to violate case conventions
+        self.name_case_whitelist = []
+
+
 class QAPISourceInfo(object):
     def __init__(self, fname, line, parent):
         self.fname = fname
         self.line = line
         self.parent = parent
+        self.pragma = parent.pragma if parent else QAPISchemaPragma()
         self.defn_meta = None
         self.defn_name = None
 
@@ -486,26 +489,25 @@ class QAPISchemaParser(object):
         return QAPISchemaParser(incl_fname, previously_included, info)
 
     def _pragma(self, name, value, info):
-        global doc_required, returns_whitelist, name_case_whitelist
         if name == 'doc-required':
             if not isinstance(value, bool):
                 raise QAPISemError(info,
                                    "pragma 'doc-required' must be boolean")
-            doc_required = value
+            info.pragma.doc_required = value
         elif name == 'returns-whitelist':
             if (not isinstance(value, list)
                     or any([not isinstance(elt, str) for elt in value])):
                 raise QAPISemError(
                     info,
                     "pragma returns-whitelist must be a list of strings")
-            returns_whitelist = value
+            info.pragma.returns_whitelist = value
         elif name == 'name-case-whitelist':
             if (not isinstance(value, list)
                     or any([not isinstance(elt, str) for elt in value])):
                 raise QAPISemError(
                     info,
                     "pragma name-case-whitelist must be a list of strings")
-            name_case_whitelist = value
+            info.pragma.name_case_whitelist = value
         else:
             raise QAPISemError(info, "unknown pragma '%s'" % name)
 
@@ -757,7 +759,7 @@ def check_type(value, info, source,
         raise QAPISemError(info,
                            "%s should be an object or type name" % source)
 
-    permit_upper = allow_dict in name_case_whitelist
+    permit_upper = allow_dict in info.pragma.name_case_whitelist
 
     # value is a dictionary, check that each member is okay
     for (key, arg) in value.items():
@@ -840,7 +842,7 @@ def check_enum(expr, info):
     if prefix is not None and not isinstance(prefix, str):
         raise QAPISemError(info, "'prefix' must be a string")
 
-    permit_upper = name in name_case_whitelist
+    permit_upper = name in info.pragma.name_case_whitelist
 
     for member in members:
         source = "'data' member"
@@ -968,7 +970,7 @@ def check_exprs(exprs):
                 raise QAPISemError(
                     info, "documentation comment is for '%s'" % doc.symbol)
             doc.check_expr(expr)
-        elif doc_required:
+        elif info.pragma.doc_required:
             raise QAPISemError(info,
                                "documentation comment required")
 
@@ -1690,7 +1692,7 @@ class QAPISchemaCommand(QAPISchemaEntity):
         if self._ret_type_name:
             self.ret_type = schema.resolve_type(
                 self._ret_type_name, self.info, "command's 'returns'")
-            if self.name not in returns_whitelist:
+            if self.name not in self.info.pragma.returns_whitelist:
                 if not (isinstance(self.ret_type, QAPISchemaObjectType)
                         or (isinstance(self.ret_type, QAPISchemaArrayType)
                             and isinstance(self.ret_type.element_type,
Signature · 1 line
2.21.0
#3 lore raw

PATCH v2 3/7 qapi: Eliminate accidental global frontend state

In reply to Markus Armbruster

The frontend can't be run more than once due to its global state. A future commit will want to do that.

The only global frontend state remaining is accidental:
QAPISchemaParser.__init__()'s parameter previously_included=[]. Python evaluates the default once, at definition time. Any modifications to it are visible in subsequent calls. Well-known Python trap. Change the default to None and replace it by the real default in the function body. Use the opportunity to convert previously_included to a set.

---
 scripts/qapi/common.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/qapi/common.py +3 -2
index 5abab44302..9d5c05f6a1 100644
@@ -391,8 +391,9 @@ class QAPIDoc(object):
 
 class QAPISchemaParser(object):
 
-    def __init__(self, fname, previously_included=[], incl_info=None):
-        previously_included.append(os.path.abspath(fname))
+    def __init__(self, fname, previously_included=None, incl_info=None):
+        previously_included = previously_included or set()
+        previously_included.add(os.path.abspath(fname))
 
         try:
             if sys.version_info[0] >= 3:
Signature · 1 line
2.21.0
#4 lore raw

PATCH v2 4/7 qapi: Speed up frontend tests

In reply to Markus Armbruster

"make check-qapi-schema" takes around 10s user + system time for me. With -j, it takes a bit over 3s real time. We have worse tests. It's still annoying when you work on the QAPI generator.

Some 1.4s user + system time is consumed by make figuring out what to do, measured by making a target that does nothing. There's nothing I can do about that right now. But let's see what we can do about the other 8s.

Almost 7s are spent running test-qapi.py for every test case, the rest normalizing and diffing test-qapi.py output. We have 190 test cases.

If I downgrade to python2, it's 4.5s, but python2 is a goner.

Hacking up test-qapi.py to exit(0) without doing anything makes it only marginally faster. The problem is Python startup overhead.

Our configure puts -B into $(PYTHON). Running without -B is faster:
4.4s.

We could improve the Makefile to run test cases only when the test case or the generator changed. But I'm after improvement in the case where the generator changed.

test-qapi.py is designed to be the simplest possible building block for a shell script to do the complete job (it's actually a Makefile, not a shell script; no real difference). Python is just not meant for that. It's for bigger blocks.

Move the post-processing and diffing into test-qapi.py, and make it capable of testing multiple schema files. Set executable bits while there.

Running it once per test case now takes slightly longer than 8s. But running it once for all of them takes under 0.2s.

Messing with the Makefile to run it only on the tests that need retesting is clearly not worth the bother.

Expected error output changes because the new normalization strips off $(SRCDIR)/tests/qapi-schema/ instead of just $(SRCDIR)/.

The .exit files go away, because there is no exit status to test anymore.

---
 tests/Makefile.include                        |  16 +--
 tests/qapi-schema/allow-preconfig-test.err    |   4 +-
 tests/qapi-schema/allow-preconfig-test.exit   |   1 -
 tests/qapi-schema/alternate-any.err           |   4 +-
 tests/qapi-schema/alternate-any.exit          |   1 -
 tests/qapi-schema/alternate-array.err         |   4 +-
 tests/qapi-schema/alternate-array.exit        |   1 -
 tests/qapi-schema/alternate-base.err          |   4 +-
 tests/qapi-schema/alternate-base.exit         |   1 -
 .../alternate-branch-if-invalid.err           |   4 +-
 .../alternate-branch-if-invalid.exit          |   1 -
 tests/qapi-schema/alternate-clash.err         |   4 +-
 tests/qapi-schema/alternate-clash.exit        |   1 -
 .../alternate-conflict-bool-string.err        |   4 +-
 .../alternate-conflict-bool-string.exit       |   1 -
 tests/qapi-schema/alternate-conflict-dict.err |   4 +-
 .../qapi-schema/alternate-conflict-dict.exit  |   1 -
 .../alternate-conflict-enum-bool.err          |   4 +-
 .../alternate-conflict-enum-bool.exit         |   1 -
 .../alternate-conflict-enum-int.err           |   4 +-
 .../alternate-conflict-enum-int.exit          |   1 -
 .../alternate-conflict-num-string.err         |   4 +-
 .../alternate-conflict-num-string.exit        |   1 -
 .../qapi-schema/alternate-conflict-string.err |   4 +-
 .../alternate-conflict-string.exit            |   1 -
 tests/qapi-schema/alternate-empty.err         |   4 +-
 tests/qapi-schema/alternate-empty.exit        |   1 -
 tests/qapi-schema/alternate-invalid-dict.err  |   4 +-
 tests/qapi-schema/alternate-invalid-dict.exit |   1 -
 tests/qapi-schema/alternate-nested.err        |   4 +-
 tests/qapi-schema/alternate-nested.exit       |   1 -
 tests/qapi-schema/alternate-unknown.err       |   4 +-
 tests/qapi-schema/alternate-unknown.exit      |   1 -
 tests/qapi-schema/args-alternate.err          |   4 +-
 tests/qapi-schema/args-alternate.exit         |   1 -
 tests/qapi-schema/args-any.err                |   4 +-
 tests/qapi-schema/args-any.exit               |   1 -
 tests/qapi-schema/args-array-empty.err        |   4 +-
 tests/qapi-schema/args-array-empty.exit       |   1 -
 tests/qapi-schema/args-array-unknown.err      |   4 +-
 tests/qapi-schema/args-array-unknown.exit     |   1 -
 tests/qapi-schema/args-bad-boxed.err          |   4 +-
 tests/qapi-schema/args-bad-boxed.exit         |   1 -
 tests/qapi-schema/args-boxed-anon.err         |   4 +-
 tests/qapi-schema/args-boxed-anon.exit        |   1 -
 tests/qapi-schema/args-boxed-string.err       |   4 +-
 tests/qapi-schema/args-boxed-string.exit      |   1 -
 tests/qapi-schema/args-int.err                |   4 +-
 tests/qapi-schema/args-int.exit               |   1 -
 tests/qapi-schema/args-invalid.err            |   4 +-
 tests/qapi-schema/args-invalid.exit           |   1 -
 tests/qapi-schema/args-member-array-bad.err   |   4 +-
 tests/qapi-schema/args-member-array-bad.exit  |   1 -
 tests/qapi-schema/args-member-case.err        |   4 +-
 tests/qapi-schema/args-member-case.exit       |   1 -
 tests/qapi-schema/args-member-unknown.err     |   4 +-
 tests/qapi-schema/args-member-unknown.exit    |   1 -
 tests/qapi-schema/args-name-clash.err         |   4 +-
 tests/qapi-schema/args-name-clash.exit        |   1 -
 tests/qapi-schema/args-union.err              |   4 +-
 tests/qapi-schema/args-union.exit             |   1 -
 tests/qapi-schema/args-unknown.err            |   4 +-
 tests/qapi-schema/args-unknown.exit           |   1 -
 tests/qapi-schema/bad-base.err                |   4 +-
 tests/qapi-schema/bad-base.exit               |   1 -
 tests/qapi-schema/bad-data.err                |   4 +-
 tests/qapi-schema/bad-data.exit               |   1 -
 tests/qapi-schema/bad-ident.err               |   4 +-
 tests/qapi-schema/bad-ident.exit              |   1 -
 tests/qapi-schema/bad-if-empty-list.err       |   4 +-
 tests/qapi-schema/bad-if-empty-list.exit      |   1 -
 tests/qapi-schema/bad-if-empty.err            |   4 +-
 tests/qapi-schema/bad-if-empty.exit           |   1 -
 tests/qapi-schema/bad-if-list.err             |   4 +-
 tests/qapi-schema/bad-if-list.exit            |   1 -
 tests/qapi-schema/bad-if.err                  |   4 +-
 tests/qapi-schema/bad-if.exit                 |   1 -
 tests/qapi-schema/bad-type-bool.err           |   2 +-
 tests/qapi-schema/bad-type-bool.exit          |   1 -
 tests/qapi-schema/bad-type-dict.err           |   2 +-
 tests/qapi-schema/bad-type-dict.exit          |   1 -
 tests/qapi-schema/bad-type-int.err            |   2 +-
 tests/qapi-schema/bad-type-int.exit           |   1 -
 tests/qapi-schema/base-cycle-direct.err       |   4 +-
 tests/qapi-schema/base-cycle-direct.exit      |   1 -
 tests/qapi-schema/base-cycle-indirect.err     |   4 +-
 tests/qapi-schema/base-cycle-indirect.exit    |   1 -
 tests/qapi-schema/command-int.err             |   4 +-
 tests/qapi-schema/command-int.exit            |   1 -
 tests/qapi-schema/comments.exit               |   1 -
 .../qapi-schema/doc-bad-alternate-member.err  |   2 +-
 .../qapi-schema/doc-bad-alternate-member.exit |   1 -
 tests/qapi-schema/doc-bad-command-arg.err     |   2 +-
 tests/qapi-schema/doc-bad-command-arg.exit    |   1 -
 tests/qapi-schema/doc-bad-section.exit        |   1 -
 tests/qapi-schema/doc-bad-symbol.err          |   4 +-
 tests/qapi-schema/doc-bad-symbol.exit         |   1 -
 tests/qapi-schema/doc-bad-union-member.err    |   2 +-
 tests/qapi-schema/doc-bad-union-member.exit   |   1 -
 tests/qapi-schema/doc-before-include.err      |   2 +-
 tests/qapi-schema/doc-before-include.exit     |   1 -
 tests/qapi-schema/doc-before-pragma.err       |   2 +-
 tests/qapi-schema/doc-before-pragma.exit      |   1 -
 tests/qapi-schema/doc-duplicated-arg.err      |   2 +-
 tests/qapi-schema/doc-duplicated-arg.exit     |   1 -
 tests/qapi-schema/doc-duplicated-return.err   |   2 +-
 tests/qapi-schema/doc-duplicated-return.exit  |   1 -
 tests/qapi-schema/doc-duplicated-since.err    |   2 +-
 tests/qapi-schema/doc-duplicated-since.exit   |   1 -
 tests/qapi-schema/doc-empty-arg.err           |   2 +-
 tests/qapi-schema/doc-empty-arg.exit          |   1 -
 tests/qapi-schema/doc-empty-section.err       |   2 +-
 tests/qapi-schema/doc-empty-section.exit      |   1 -
 tests/qapi-schema/doc-empty-symbol.err        |   2 +-
 tests/qapi-schema/doc-empty-symbol.exit       |   1 -
 tests/qapi-schema/doc-good.exit               |   1 -
 tests/qapi-schema/doc-interleaved-section.err |   2 +-
 .../qapi-schema/doc-interleaved-section.exit  |   1 -
 tests/qapi-schema/doc-invalid-end.err         |   2 +-
 tests/qapi-schema/doc-invalid-end.exit        |   1 -
 tests/qapi-schema/doc-invalid-end2.err        |   2 +-
 tests/qapi-schema/doc-invalid-end2.exit       |   1 -
 tests/qapi-schema/doc-invalid-return.err      |   2 +-
 tests/qapi-schema/doc-invalid-return.exit     |   1 -
 tests/qapi-schema/doc-invalid-section.err     |   2 +-
 tests/qapi-schema/doc-invalid-section.exit    |   1 -
 tests/qapi-schema/doc-invalid-start.err       |   2 +-
 tests/qapi-schema/doc-invalid-start.exit      |   1 -
 tests/qapi-schema/doc-missing-colon.err       |   2 +-
 tests/qapi-schema/doc-missing-colon.exit      |   1 -
 tests/qapi-schema/doc-missing-expr.err        |   2 +-
 tests/qapi-schema/doc-missing-expr.exit       |   1 -
 tests/qapi-schema/doc-missing-space.err       |   2 +-
 tests/qapi-schema/doc-missing-space.exit      |   1 -
 tests/qapi-schema/doc-missing.err             |   4 +-
 tests/qapi-schema/doc-missing.exit            |   1 -
 tests/qapi-schema/doc-no-symbol.err           |   2 +-
 tests/qapi-schema/doc-no-symbol.exit          |   1 -
 tests/qapi-schema/double-type.err             |   4 +-
 tests/qapi-schema/double-type.exit            |   1 -
 tests/qapi-schema/duplicate-key.err           |   2 +-
 tests/qapi-schema/duplicate-key.exit          |   1 -
 tests/qapi-schema/empty.exit                  |   1 -
 tests/qapi-schema/enum-bad-member.err         |   4 +-
 tests/qapi-schema/enum-bad-member.exit        |   1 -
 tests/qapi-schema/enum-bad-name.err           |   4 +-
 tests/qapi-schema/enum-bad-name.exit          |   1 -
 tests/qapi-schema/enum-bad-prefix.err         |   4 +-
 tests/qapi-schema/enum-bad-prefix.exit        |   1 -
 tests/qapi-schema/enum-clash-member.err       |   4 +-
 tests/qapi-schema/enum-clash-member.exit      |   1 -
 .../qapi-schema/enum-dict-member-unknown.err  |   4 +-
 .../qapi-schema/enum-dict-member-unknown.exit |   1 -
 tests/qapi-schema/enum-if-invalid.err         |   4 +-
 tests/qapi-schema/enum-if-invalid.exit        |   1 -
 tests/qapi-schema/enum-int-member.err         |   2 +-
 tests/qapi-schema/enum-int-member.exit        |   1 -
 tests/qapi-schema/enum-member-case.err        |   4 +-
 tests/qapi-schema/enum-member-case.exit       |   1 -
 tests/qapi-schema/enum-missing-data.err       |   4 +-
 tests/qapi-schema/enum-missing-data.exit      |   1 -
 tests/qapi-schema/enum-wrong-data.err         |   4 +-
 tests/qapi-schema/enum-wrong-data.exit        |   1 -
 tests/qapi-schema/escape-outside-string.err   |   2 +-
 tests/qapi-schema/event-boxed-empty.err       |   4 +-
 tests/qapi-schema/event-boxed-empty.exit      |   1 -
 tests/qapi-schema/event-case.exit             |   1 -
 .../qapi-schema/event-member-invalid-dict.err |   4 +-
 .../event-member-invalid-dict.exit            |   1 -
 tests/qapi-schema/event-nest-struct.err       |   4 +-
 tests/qapi-schema/event-nest-struct.exit      |   1 -
 tests/qapi-schema/features-bad-type.err       |   4 +-
 tests/qapi-schema/features-bad-type.exit      |   1 -
 tests/qapi-schema/features-duplicate-name.err |   4 +-
 .../qapi-schema/features-duplicate-name.exit  |   1 -
 tests/qapi-schema/features-if-invalid.err     |   4 +-
 tests/qapi-schema/features-if-invalid.exit    |   1 -
 tests/qapi-schema/features-missing-name.err   |   4 +-
 tests/qapi-schema/features-missing-name.exit  |   1 -
 tests/qapi-schema/features-name-bad-type.err  |   4 +-
 tests/qapi-schema/features-name-bad-type.exit |   1 -
 tests/qapi-schema/features-no-list.err        |   4 +-
 tests/qapi-schema/features-no-list.exit       |   1 -
 tests/qapi-schema/features-unknown-key.err    |   4 +-
 tests/qapi-schema/features-unknown-key.exit   |   1 -
 tests/qapi-schema/flat-union-array-branch.err |   4 +-
 .../qapi-schema/flat-union-array-branch.exit  |   1 -
 tests/qapi-schema/flat-union-bad-base.err     |   4 +-
 tests/qapi-schema/flat-union-bad-base.exit    |   1 -
 .../flat-union-bad-discriminator.err          |   4 +-
 .../flat-union-bad-discriminator.exit         |   1 -
 tests/qapi-schema/flat-union-base-any.err     |   4 +-
 tests/qapi-schema/flat-union-base-any.exit    |   1 -
 tests/qapi-schema/flat-union-base-union.err   |   4 +-
 tests/qapi-schema/flat-union-base-union.exit  |   1 -
 tests/qapi-schema/flat-union-clash-member.err |   4 +-
 .../qapi-schema/flat-union-clash-member.exit  |   1 -
 .../flat-union-discriminator-bad-name.err     |   4 +-
 .../flat-union-discriminator-bad-name.exit    |   1 -
 tests/qapi-schema/flat-union-empty.err        |   4 +-
 tests/qapi-schema/flat-union-empty.exit       |   1 -
 .../flat-union-inline-invalid-dict.err        |   4 +-
 .../flat-union-inline-invalid-dict.exit       |   1 -
 tests/qapi-schema/flat-union-inline.err       |   4 +-
 tests/qapi-schema/flat-union-inline.exit      |   1 -
 tests/qapi-schema/flat-union-int-branch.err   |   4 +-
 tests/qapi-schema/flat-union-int-branch.exit  |   1 -
 .../flat-union-invalid-branch-key.err         |   4 +-
 .../flat-union-invalid-branch-key.exit        |   1 -
 .../flat-union-invalid-discriminator.err      |   4 +-
 .../flat-union-invalid-discriminator.exit     |   1 -
 .../flat-union-invalid-if-discriminator.err   |   4 +-
 .../flat-union-invalid-if-discriminator.exit  |   1 -
 tests/qapi-schema/flat-union-no-base.err      |   4 +-
 tests/qapi-schema/flat-union-no-base.exit     |   1 -
 .../flat-union-optional-discriminator.err     |   4 +-
 .../flat-union-optional-discriminator.exit    |   1 -
 .../flat-union-string-discriminator.err       |   4 +-
 .../flat-union-string-discriminator.exit      |   1 -
 tests/qapi-schema/funny-char.err              |   2 +-
 tests/qapi-schema/funny-char.exit             |   1 -
 tests/qapi-schema/funny-word.err              |   2 +-
 tests/qapi-schema/funny-word.exit             |   1 -
 tests/qapi-schema/ident-with-escape.err       |   2 +-
 tests/qapi-schema/ident-with-escape.exit      |   1 -
 tests/qapi-schema/include-before-err.err      |   2 +-
 tests/qapi-schema/include-before-err.exit     |   1 -
 tests/qapi-schema/include-cycle.err           |   6 +-
 tests/qapi-schema/include-cycle.exit          |   1 -
 tests/qapi-schema/include-extra-junk.err      |   2 +-
 tests/qapi-schema/include-extra-junk.exit     |   1 -
 tests/qapi-schema/include-nested-err.err      |   4 +-
 tests/qapi-schema/include-nested-err.exit     |   1 -
 tests/qapi-schema/include-no-file.err         |   2 +-
 tests/qapi-schema/include-no-file.exit        |   1 -
 tests/qapi-schema/include-non-file.err        |   2 +-
 tests/qapi-schema/include-non-file.exit       |   1 -
 tests/qapi-schema/include-repetition.exit     |   1 -
 tests/qapi-schema/include-self-cycle.err      |   2 +-
 tests/qapi-schema/include-self-cycle.exit     |   1 -
 tests/qapi-schema/include-simple.exit         |   1 -
 tests/qapi-schema/indented-expr.exit          |   1 -
 tests/qapi-schema/leading-comma-list.err      |   2 +-
 tests/qapi-schema/leading-comma-list.exit     |   1 -
 tests/qapi-schema/leading-comma-object.err    |   2 +-
 tests/qapi-schema/leading-comma-object.exit   |   1 -
 tests/qapi-schema/missing-colon.err           |   2 +-
 tests/qapi-schema/missing-colon.exit          |   1 -
 tests/qapi-schema/missing-comma-list.err      |   2 +-
 tests/qapi-schema/missing-comma-list.exit     |   1 -
 tests/qapi-schema/missing-comma-object.err    |   2 +-
 tests/qapi-schema/missing-comma-object.exit   |   1 -
 tests/qapi-schema/missing-type.err            |   2 +-
 tests/qapi-schema/missing-type.exit           |   1 -
 .../nested-struct-data-invalid-dict.err       |   4 +-
 .../nested-struct-data-invalid-dict.exit      |   1 -
 tests/qapi-schema/nested-struct-data.err      |   4 +-
 tests/qapi-schema/nested-struct-data.exit     |   1 -
 tests/qapi-schema/non-objects.err             |   2 +-
 tests/qapi-schema/non-objects.exit            |   1 -
 tests/qapi-schema/oob-test.err                |   4 +-
 tests/qapi-schema/oob-test.exit               |   1 -
 .../qapi-schema/pragma-doc-required-crap.err  |   2 +-
 .../qapi-schema/pragma-doc-required-crap.exit |   1 -
 tests/qapi-schema/pragma-extra-junk.err       |   2 +-
 tests/qapi-schema/pragma-extra-junk.exit      |   1 -
 .../pragma-name-case-whitelist-crap.err       |   2 +-
 .../pragma-name-case-whitelist-crap.exit      |   1 -
 tests/qapi-schema/pragma-non-dict.err         |   2 +-
 tests/qapi-schema/pragma-non-dict.exit        |   1 -
 .../pragma-returns-whitelist-crap.err         |   2 +-
 .../pragma-returns-whitelist-crap.exit        |   1 -
 tests/qapi-schema/pragma-unknown.err          |   2 +-
 tests/qapi-schema/pragma-unknown.exit         |   1 -
 tests/qapi-schema/qapi-schema-test.exit       |   1 -
 tests/qapi-schema/quoted-structural-chars.err |   2 +-
 .../qapi-schema/quoted-structural-chars.exit  |   1 -
 tests/qapi-schema/redefined-builtin.err       |   4 +-
 tests/qapi-schema/redefined-builtin.exit      |   1 -
 tests/qapi-schema/redefined-command.err       |   8 +-
 tests/qapi-schema/redefined-command.exit      |   1 -
 tests/qapi-schema/redefined-event.err         |   8 +-
 tests/qapi-schema/redefined-event.exit        |   1 -
 tests/qapi-schema/redefined-type.err          |   8 +-
 tests/qapi-schema/redefined-type.exit         |   1 -
 tests/qapi-schema/reserved-command-q.err      |   4 +-
 tests/qapi-schema/reserved-command-q.exit     |   1 -
 tests/qapi-schema/reserved-enum-q.err         |   4 +-
 tests/qapi-schema/reserved-enum-q.exit        |   1 -
 tests/qapi-schema/reserved-member-has.err     |   4 +-
 tests/qapi-schema/reserved-member-has.exit    |   1 -
 tests/qapi-schema/reserved-member-q.err       |   4 +-
 tests/qapi-schema/reserved-member-q.exit      |   1 -
 tests/qapi-schema/reserved-member-u.err       |   4 +-
 tests/qapi-schema/reserved-member-u.exit      |   1 -
 .../reserved-member-underscore.err            |   4 +-
 .../reserved-member-underscore.exit           |   1 -
 tests/qapi-schema/reserved-type-kind.err      |   4 +-
 tests/qapi-schema/reserved-type-kind.exit     |   1 -
 tests/qapi-schema/reserved-type-list.err      |   4 +-
 tests/qapi-schema/reserved-type-list.exit     |   1 -
 tests/qapi-schema/returns-alternate.err       |   4 +-
 tests/qapi-schema/returns-alternate.exit      |   1 -
 tests/qapi-schema/returns-array-bad.err       |   4 +-
 tests/qapi-schema/returns-array-bad.exit      |   1 -
 tests/qapi-schema/returns-dict.err            |   4 +-
 tests/qapi-schema/returns-dict.exit           |   1 -
 tests/qapi-schema/returns-unknown.err         |   4 +-
 tests/qapi-schema/returns-unknown.exit        |   1 -
 tests/qapi-schema/returns-whitelist.err       |   4 +-
 tests/qapi-schema/returns-whitelist.exit      |   1 -
 tests/qapi-schema/string-code-point-127.err   |   2 +-
 tests/qapi-schema/string-code-point-127.exit  |   1 -
 tests/qapi-schema/string-code-point-31.err    |   2 +-
 tests/qapi-schema/string-code-point-31.exit   |   1 -
 tests/qapi-schema/struct-base-clash-deep.err  |   4 +-
 tests/qapi-schema/struct-base-clash-deep.exit |   1 -
 tests/qapi-schema/struct-base-clash.err       |   4 +-
 tests/qapi-schema/struct-base-clash.exit      |   1 -
 tests/qapi-schema/struct-data-invalid.err     |   4 +-
 tests/qapi-schema/struct-data-invalid.exit    |   1 -
 .../qapi-schema/struct-member-if-invalid.err  |   4 +-
 .../qapi-schema/struct-member-if-invalid.exit |   1 -
 .../struct-member-invalid-dict.err            |   4 +-
 .../struct-member-invalid-dict.exit           |   1 -
 tests/qapi-schema/struct-member-invalid.err   |   4 +-
 tests/qapi-schema/struct-member-invalid.exit  |   1 -
 tests/qapi-schema/test-qapi.py                | 119 +++++++++++++++---
 tests/qapi-schema/trailing-comma-list.err     |   2 +-
 tests/qapi-schema/trailing-comma-list.exit    |   1 -
 tests/qapi-schema/trailing-comma-object.err   |   2 +-
 tests/qapi-schema/trailing-comma-object.exit  |   1 -
 tests/qapi-schema/type-bypass-bad-gen.err     |   4 +-
 tests/qapi-schema/type-bypass-bad-gen.exit    |   1 -
 tests/qapi-schema/unclosed-list.err           |   2 +-
 tests/qapi-schema/unclosed-list.exit          |   1 -
 tests/qapi-schema/unclosed-object.err         |   2 +-
 tests/qapi-schema/unclosed-object.exit        |   1 -
 tests/qapi-schema/unclosed-string.err         |   2 +-
 tests/qapi-schema/unclosed-string.exit        |   1 -
 tests/qapi-schema/union-base-empty.err        |   4 +-
 tests/qapi-schema/union-base-empty.exit       |   1 -
 .../union-base-no-discriminator.err           |   4 +-
 .../union-base-no-discriminator.exit          |   1 -
 tests/qapi-schema/union-branch-case.err       |   4 +-
 tests/qapi-schema/union-branch-case.exit      |   1 -
 tests/qapi-schema/union-branch-if-invalid.err |   4 +-
 .../qapi-schema/union-branch-if-invalid.exit  |   1 -
 .../qapi-schema/union-branch-invalid-dict.err |   4 +-
 .../union-branch-invalid-dict.exit            |   1 -
 tests/qapi-schema/union-clash-branches.err    |   4 +-
 tests/qapi-schema/union-clash-branches.exit   |   1 -
 tests/qapi-schema/union-empty.err             |   4 +-
 tests/qapi-schema/union-empty.exit            |   1 -
 tests/qapi-schema/union-invalid-base.err      |   4 +-
 tests/qapi-schema/union-invalid-base.exit     |   1 -
 tests/qapi-schema/union-optional-branch.err   |   4 +-
 tests/qapi-schema/union-optional-branch.exit  |   1 -
 tests/qapi-schema/union-unknown.err           |   4 +-
 tests/qapi-schema/union-unknown.exit          |   1 -
 tests/qapi-schema/unknown-escape.err          |   2 +-
 tests/qapi-schema/unknown-escape.exit         |   1 -
 tests/qapi-schema/unknown-expr-key.err        |   4 +-
 tests/qapi-schema/unknown-expr-key.exit       |   1 -
 364 files changed, 413 insertions(+), 515 deletions(-)
 delete mode 100644 tests/qapi-schema/allow-preconfig-test.exit
 delete mode 100644 tests/qapi-schema/alternate-any.exit
 delete mode 100644 tests/qapi-schema/alternate-array.exit
 delete mode 100644 tests/qapi-schema/alternate-base.exit
 delete mode 100644 tests/qapi-schema/alternate-branch-if-invalid.exit
 delete mode 100644 tests/qapi-schema/alternate-clash.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-bool-string.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-dict.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-enum-bool.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-enum-int.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-num-string.exit
 delete mode 100644 tests/qapi-schema/alternate-conflict-string.exit
 delete mode 100644 tests/qapi-schema/alternate-empty.exit
 delete mode 100644 tests/qapi-schema/alternate-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/alternate-nested.exit
 delete mode 100644 tests/qapi-schema/alternate-unknown.exit
 delete mode 100644 tests/qapi-schema/args-alternate.exit
 delete mode 100644 tests/qapi-schema/args-any.exit
 delete mode 100644 tests/qapi-schema/args-array-empty.exit
 delete mode 100644 tests/qapi-schema/args-array-unknown.exit
 delete mode 100644 tests/qapi-schema/args-bad-boxed.exit
 delete mode 100644 tests/qapi-schema/args-boxed-anon.exit
 delete mode 100644 tests/qapi-schema/args-boxed-string.exit
 delete mode 100644 tests/qapi-schema/args-int.exit
 delete mode 100644 tests/qapi-schema/args-invalid.exit
 delete mode 100644 tests/qapi-schema/args-member-array-bad.exit
 delete mode 100644 tests/qapi-schema/args-member-case.exit
 delete mode 100644 tests/qapi-schema/args-member-unknown.exit
 delete mode 100644 tests/qapi-schema/args-name-clash.exit
 delete mode 100644 tests/qapi-schema/args-union.exit
 delete mode 100644 tests/qapi-schema/args-unknown.exit
 delete mode 100644 tests/qapi-schema/bad-base.exit
 delete mode 100644 tests/qapi-schema/bad-data.exit
 delete mode 100644 tests/qapi-schema/bad-ident.exit
 delete mode 100644 tests/qapi-schema/bad-if-empty-list.exit
 delete mode 100644 tests/qapi-schema/bad-if-empty.exit
 delete mode 100644 tests/qapi-schema/bad-if-list.exit
 delete mode 100644 tests/qapi-schema/bad-if.exit
 delete mode 100644 tests/qapi-schema/bad-type-bool.exit
 delete mode 100644 tests/qapi-schema/bad-type-dict.exit
 delete mode 100644 tests/qapi-schema/bad-type-int.exit
 delete mode 100644 tests/qapi-schema/base-cycle-direct.exit
 delete mode 100644 tests/qapi-schema/base-cycle-indirect.exit
 delete mode 100644 tests/qapi-schema/command-int.exit
 delete mode 100644 tests/qapi-schema/comments.exit
 delete mode 100644 tests/qapi-schema/doc-bad-alternate-member.exit
 delete mode 100644 tests/qapi-schema/doc-bad-command-arg.exit
 delete mode 100644 tests/qapi-schema/doc-bad-section.exit
 delete mode 100644 tests/qapi-schema/doc-bad-symbol.exit
 delete mode 100644 tests/qapi-schema/doc-bad-union-member.exit
 delete mode 100644 tests/qapi-schema/doc-before-include.exit
 delete mode 100644 tests/qapi-schema/doc-before-pragma.exit
 delete mode 100644 tests/qapi-schema/doc-duplicated-arg.exit
 delete mode 100644 tests/qapi-schema/doc-duplicated-return.exit
 delete mode 100644 tests/qapi-schema/doc-duplicated-since.exit
 delete mode 100644 tests/qapi-schema/doc-empty-arg.exit
 delete mode 100644 tests/qapi-schema/doc-empty-section.exit
 delete mode 100644 tests/qapi-schema/doc-empty-symbol.exit
 delete mode 100644 tests/qapi-schema/doc-good.exit
 delete mode 100644 tests/qapi-schema/doc-interleaved-section.exit
 delete mode 100644 tests/qapi-schema/doc-invalid-end.exit
 delete mode 100644 tests/qapi-schema/doc-invalid-end2.exit
 delete mode 100644 tests/qapi-schema/doc-invalid-return.exit
 delete mode 100644 tests/qapi-schema/doc-invalid-section.exit
 delete mode 100644 tests/qapi-schema/doc-invalid-start.exit
 delete mode 100644 tests/qapi-schema/doc-missing-colon.exit
 delete mode 100644 tests/qapi-schema/doc-missing-expr.exit
 delete mode 100644 tests/qapi-schema/doc-missing-space.exit
 delete mode 100644 tests/qapi-schema/doc-missing.exit
 delete mode 100644 tests/qapi-schema/doc-no-symbol.exit
 delete mode 100644 tests/qapi-schema/double-type.exit
 delete mode 100644 tests/qapi-schema/duplicate-key.exit
 delete mode 100644 tests/qapi-schema/empty.exit
 delete mode 100644 tests/qapi-schema/enum-bad-member.exit
 delete mode 100644 tests/qapi-schema/enum-bad-name.exit
 delete mode 100644 tests/qapi-schema/enum-bad-prefix.exit
 delete mode 100644 tests/qapi-schema/enum-clash-member.exit
 delete mode 100644 tests/qapi-schema/enum-dict-member-unknown.exit
 delete mode 100644 tests/qapi-schema/enum-if-invalid.exit
 delete mode 100644 tests/qapi-schema/enum-int-member.exit
 delete mode 100644 tests/qapi-schema/enum-member-case.exit
 delete mode 100644 tests/qapi-schema/enum-missing-data.exit
 delete mode 100644 tests/qapi-schema/enum-wrong-data.exit
 delete mode 100644 tests/qapi-schema/event-boxed-empty.exit
 delete mode 100644 tests/qapi-schema/event-case.exit
 delete mode 100644 tests/qapi-schema/event-member-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/event-nest-struct.exit
 delete mode 100644 tests/qapi-schema/features-bad-type.exit
 delete mode 100644 tests/qapi-schema/features-duplicate-name.exit
 delete mode 100644 tests/qapi-schema/features-if-invalid.exit
 delete mode 100644 tests/qapi-schema/features-missing-name.exit
 delete mode 100644 tests/qapi-schema/features-name-bad-type.exit
 delete mode 100644 tests/qapi-schema/features-no-list.exit
 delete mode 100644 tests/qapi-schema/features-unknown-key.exit
 delete mode 100644 tests/qapi-schema/flat-union-array-branch.exit
 delete mode 100644 tests/qapi-schema/flat-union-bad-base.exit
 delete mode 100644 tests/qapi-schema/flat-union-bad-discriminator.exit
 delete mode 100644 tests/qapi-schema/flat-union-base-any.exit
 delete mode 100644 tests/qapi-schema/flat-union-base-union.exit
 delete mode 100644 tests/qapi-schema/flat-union-clash-member.exit
 delete mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.exit
 delete mode 100644 tests/qapi-schema/flat-union-empty.exit
 delete mode 100644 tests/qapi-schema/flat-union-inline-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/flat-union-inline.exit
 delete mode 100644 tests/qapi-schema/flat-union-int-branch.exit
 delete mode 100644 tests/qapi-schema/flat-union-invalid-branch-key.exit
 delete mode 100644 tests/qapi-schema/flat-union-invalid-discriminator.exit
 delete mode 100644 tests/qapi-schema/flat-union-invalid-if-discriminator.exit
 delete mode 100644 tests/qapi-schema/flat-union-no-base.exit
 delete mode 100644 tests/qapi-schema/flat-union-optional-discriminator.exit
 delete mode 100644 tests/qapi-schema/flat-union-string-discriminator.exit
 delete mode 100644 tests/qapi-schema/funny-char.exit
 delete mode 100644 tests/qapi-schema/funny-word.exit
 delete mode 100644 tests/qapi-schema/ident-with-escape.exit
 delete mode 100644 tests/qapi-schema/include-before-err.exit
 delete mode 100644 tests/qapi-schema/include-cycle.exit
 delete mode 100644 tests/qapi-schema/include-extra-junk.exit
 delete mode 100644 tests/qapi-schema/include-nested-err.exit
 delete mode 100644 tests/qapi-schema/include-no-file.exit
 delete mode 100644 tests/qapi-schema/include-non-file.exit
 delete mode 100644 tests/qapi-schema/include-repetition.exit
 delete mode 100644 tests/qapi-schema/include-self-cycle.exit
 delete mode 100644 tests/qapi-schema/include-simple.exit
 delete mode 100644 tests/qapi-schema/indented-expr.exit
 delete mode 100644 tests/qapi-schema/leading-comma-list.exit
 delete mode 100644 tests/qapi-schema/leading-comma-object.exit
 delete mode 100644 tests/qapi-schema/missing-colon.exit
 delete mode 100644 tests/qapi-schema/missing-comma-list.exit
 delete mode 100644 tests/qapi-schema/missing-comma-object.exit
 delete mode 100644 tests/qapi-schema/missing-type.exit
 delete mode 100644 tests/qapi-schema/nested-struct-data-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/nested-struct-data.exit
 delete mode 100644 tests/qapi-schema/non-objects.exit
 delete mode 100644 tests/qapi-schema/oob-test.exit
 delete mode 100644 tests/qapi-schema/pragma-doc-required-crap.exit
 delete mode 100644 tests/qapi-schema/pragma-extra-junk.exit
 delete mode 100644 tests/qapi-schema/pragma-name-case-whitelist-crap.exit
 delete mode 100644 tests/qapi-schema/pragma-non-dict.exit
 delete mode 100644 tests/qapi-schema/pragma-returns-whitelist-crap.exit
 delete mode 100644 tests/qapi-schema/pragma-unknown.exit
 delete mode 100644 tests/qapi-schema/qapi-schema-test.exit
 delete mode 100644 tests/qapi-schema/quoted-structural-chars.exit
 delete mode 100644 tests/qapi-schema/redefined-builtin.exit
 delete mode 100644 tests/qapi-schema/redefined-command.exit
 delete mode 100644 tests/qapi-schema/redefined-event.exit
 delete mode 100644 tests/qapi-schema/redefined-type.exit
 delete mode 100644 tests/qapi-schema/reserved-command-q.exit
 delete mode 100644 tests/qapi-schema/reserved-enum-q.exit
 delete mode 100644 tests/qapi-schema/reserved-member-has.exit
 delete mode 100644 tests/qapi-schema/reserved-member-q.exit
 delete mode 100644 tests/qapi-schema/reserved-member-u.exit
 delete mode 100644 tests/qapi-schema/reserved-member-underscore.exit
 delete mode 100644 tests/qapi-schema/reserved-type-kind.exit
 delete mode 100644 tests/qapi-schema/reserved-type-list.exit
 delete mode 100644 tests/qapi-schema/returns-alternate.exit
 delete mode 100644 tests/qapi-schema/returns-array-bad.exit
 delete mode 100644 tests/qapi-schema/returns-dict.exit
 delete mode 100644 tests/qapi-schema/returns-unknown.exit
 delete mode 100644 tests/qapi-schema/returns-whitelist.exit
 delete mode 100644 tests/qapi-schema/string-code-point-127.exit
 delete mode 100644 tests/qapi-schema/string-code-point-31.exit
 delete mode 100644 tests/qapi-schema/struct-base-clash-deep.exit
 delete mode 100644 tests/qapi-schema/struct-base-clash.exit
 delete mode 100644 tests/qapi-schema/struct-data-invalid.exit
 delete mode 100644 tests/qapi-schema/struct-member-if-invalid.exit
 delete mode 100644 tests/qapi-schema/struct-member-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/struct-member-invalid.exit
 mode change 100644 => 100755 tests/qapi-schema/test-qapi.py
 delete mode 100644 tests/qapi-schema/trailing-comma-list.exit
 delete mode 100644 tests/qapi-schema/trailing-comma-object.exit
 delete mode 100644 tests/qapi-schema/type-bypass-bad-gen.exit
 delete mode 100644 tests/qapi-schema/unclosed-list.exit
 delete mode 100644 tests/qapi-schema/unclosed-object.exit
 delete mode 100644 tests/qapi-schema/unclosed-string.exit
 delete mode 100644 tests/qapi-schema/union-base-empty.exit
 delete mode 100644 tests/qapi-schema/union-base-no-discriminator.exit
 delete mode 100644 tests/qapi-schema/union-branch-case.exit
 delete mode 100644 tests/qapi-schema/union-branch-if-invalid.exit
 delete mode 100644 tests/qapi-schema/union-branch-invalid-dict.exit
 delete mode 100644 tests/qapi-schema/union-clash-branches.exit
 delete mode 100644 tests/qapi-schema/union-empty.exit
 delete mode 100644 tests/qapi-schema/union-invalid-base.exit
 delete mode 100644 tests/qapi-schema/union-optional-branch.exit
 delete mode 100644 tests/qapi-schema/union-unknown.exit
 delete mode 100644 tests/qapi-schema/unknown-escape.exit
 delete mode 100644 tests/qapi-schema/unknown-expr-key.exit
tests/Makefile.include +5 -11
index 214fbd941c..1b24b8ba10 100644
@@ -1102,17 +1102,11 @@ check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \
 		$(patsubst %,%/all,$(filter %-softmmu,$(TARGET_DIRS)))
 	@$<
 
-.PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
-$(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH)/%.json
+.PHONY: check-tests/qapi-schema/frontend
+check-tests/qapi-schema/frontend: $(addprefix $(SRC_PATH)/, $(check-qapi-schema-y))
 	$(call quiet-command, PYTHONPATH=$(SRC_PATH)/scripts \
-		PYTHONIOENCODING=utf-8 $(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-qapi.py \
-		$^ >$*.test.out 2>$*.test.err; \
-		echo $$? >$*.test.exit, \
-		"TEST","$*.out")
-	@# Sanitize error messages (make them independent of build directory)
-	@perl -p -e 's|\Q$(SRC_PATH)\E/||g' $*.test.err | diff -u $(SRC_PATH)/$*.err -
-	@diff -u $(SRC_PATH)/$*.out $*.test.out
-	@diff -u $(SRC_PATH)/$*.exit $*.test.exit
+	  PYTHONIOENCODING=utf-8 $(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-qapi.py $^, \
+	  TEST, check-qapi-schema)
 
 .PHONY: check-tests/qapi-schema/doc-good.texi
 check-tests/qapi-schema/doc-good.texi: tests/qapi-schema/doc-good.test.texi
@@ -1170,7 +1164,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
 # Consolidated targets
 
 .PHONY: check-block check-qapi-schema check-qtest check-unit check check-clean
-check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tests/qapi-schema/doc-good.texi
+check-qapi-schema: check-tests/qapi-schema/frontend check-tests/qapi-schema/doc-good.texi
 check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
 check-block: $(patsubst %,check-%, $(check-block-y))
 check: check-block check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
tests/qapi-schema/allow-preconfig-test.err +2 -2
index 2a4e6ce663..3cd672bc61 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/allow-preconfig-test.json: In command 'allow-preconfig-test':
-tests/qapi-schema/allow-preconfig-test.json:2: flag 'allow-preconfig' may only use true value
+allow-preconfig-test.json: In command 'allow-preconfig-test':
+allow-preconfig-test.json:2: flag 'allow-preconfig' may only use true value
tests/qapi-schema/allow-preconfig-test.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-any.err +2 -2
index 03aaf29506..baeb3f66d1 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-any.json: In alternate 'Alt':
-tests/qapi-schema/alternate-any.json:2: branch 'one' cannot use built-in type 'any'
+alternate-any.json: In alternate 'Alt':
+alternate-any.json:2: branch 'one' cannot use built-in type 'any'
tests/qapi-schema/alternate-any.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-array.err +2 -2
index dfbe3ee998..b1aa1f4e8d 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-array.json: In alternate 'Alt':
-tests/qapi-schema/alternate-array.json:5: 'data' member 'two' cannot be an array
+alternate-array.json: In alternate 'Alt':
+alternate-array.json:5: 'data' member 'two' cannot be an array
tests/qapi-schema/alternate-array.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-base.err +2 -2
index 04cea97e5c..31ebe56bbf 100644
@@ -1,3 +1,3 @@
-tests/qapi-schema/alternate-base.json: In alternate 'Alt':
-tests/qapi-schema/alternate-base.json:4: alternate has unknown key 'base'
+alternate-base.json: In alternate 'Alt':
+alternate-base.json:4: alternate has unknown key 'base'
 Valid keys are 'alternate', 'data', 'if'.
tests/qapi-schema/alternate-base.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-branch-if-invalid.err +2 -2
index 6c68e5a922..d384929c51 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-branch-if-invalid.json: In alternate 'Alt':
-tests/qapi-schema/alternate-branch-if-invalid.json:2: 'if' condition ' ' of 'data' member 'branch' makes no sense
+alternate-branch-if-invalid.json: In alternate 'Alt':
+alternate-branch-if-invalid.json:2: 'if' condition ' ' of 'data' member 'branch' makes no sense
tests/qapi-schema/alternate-branch-if-invalid.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-clash.err +2 -2
index 73a52d69d1..f58b977f7b 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-clash.json: In alternate 'Alt1':
-tests/qapi-schema/alternate-clash.json:7: branch 'a_b' collides with branch 'a-b'
+alternate-clash.json: In alternate 'Alt1':
+alternate-clash.json:7: branch 'a_b' collides with branch 'a-b'
tests/qapi-schema/alternate-clash.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-conflict-bool-string.err +2 -2
index f7513b9cbe..59ff5efa87 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-conflict-bool-string.json: In alternate 'Alt':
-tests/qapi-schema/alternate-conflict-bool-string.json:2: branch 'two' can't be distinguished from 'one'
+alternate-conflict-bool-string.json: In alternate 'Alt':
+alternate-conflict-bool-string.json:2: branch 'two' can't be distinguished from 'one'
tests/qapi-schema/alternate-conflict-bool-string.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-conflict-dict.err +2 -2
index e5b42d04c9..d4970284ba 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-conflict-dict.json: In alternate 'Alt':
-tests/qapi-schema/alternate-conflict-dict.json:6: branch 'two' can't be distinguished from 'one'
+alternate-conflict-dict.json: In alternate 'Alt':
+alternate-conflict-dict.json:6: branch 'two' can't be distinguished from 'one'
tests/qapi-schema/alternate-conflict-dict.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-conflict-enum-bool.err +2 -2
index 3d23aeba51..5f35855274 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-conflict-enum-bool.json: In alternate 'Alt':
-tests/qapi-schema/alternate-conflict-enum-bool.json:4: branch 'two' can't be distinguished from 'one'
+alternate-conflict-enum-bool.json: In alternate 'Alt':
+alternate-conflict-enum-bool.json:4: branch 'two' can't be distinguished from 'one'
tests/qapi-schema/alternate-conflict-enum-bool.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-conflict-enum-int.err +2 -2
index b72768caa4..6a6d156664 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-conflict-enum-int.json: In alternate 'Alt':
-tests/qapi-schema/alternate-conflict-enum-int.json:4: branch 'two' can't be distinguished from 'one'
+alternate-conflict-enum-int.json: In alternate 'Alt':
+alternate-conflict-enum-int.json:4: branch 'two' can't be distinguished from 'one'
tests/qapi-schema/alternate-conflict-enum-int.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-conflict-num-string.err +2 -2
index b8a2bb1829..38c805ea1f 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-conflict-num-string.json: In alternate 'Alt':
-tests/qapi-schema/alternate-conflict-num-string.json:2: branch 'two' can't be distinguished from 'one'
+alternate-conflict-num-string.json: In alternate 'Alt':
+alternate-conflict-num-string.json:2: branch 'two' can't be distinguished from 'one'
tests/qapi-schema/alternate-conflict-num-string.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-conflict-string.err +2 -2
index 3edec51911..2fa08193db 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-conflict-string.json: In alternate 'Alt':
-tests/qapi-schema/alternate-conflict-string.json:2: branch 'two' can't be distinguished from 'one'
+alternate-conflict-string.json: In alternate 'Alt':
+alternate-conflict-string.json:2: branch 'two' can't be distinguished from 'one'
tests/qapi-schema/alternate-conflict-string.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-empty.err +2 -2
index 908c309518..c6f6401d18 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-empty.json: In alternate 'Alt':
-tests/qapi-schema/alternate-empty.json:2: 'data' must not be empty
+alternate-empty.json: In alternate 'Alt':
+alternate-empty.json:2: 'data' must not be empty
tests/qapi-schema/alternate-empty.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-invalid-dict.err +2 -2
index d6a18a294b..e9e5025226 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-invalid-dict.json: In alternate 'Alt':
-tests/qapi-schema/alternate-invalid-dict.json:2: 'data' member 'two' misses key 'type'
+alternate-invalid-dict.json: In alternate 'Alt':
+alternate-invalid-dict.json:2: 'data' member 'two' misses key 'type'
tests/qapi-schema/alternate-invalid-dict.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-nested.err +2 -2
index cd7a076ce5..3ae9cd2f11 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-nested.json: In alternate 'Alt2':
-tests/qapi-schema/alternate-nested.json:4: branch 'nested' cannot use alternate type 'Alt1'
+alternate-nested.json: In alternate 'Alt2':
+alternate-nested.json:4: branch 'nested' cannot use alternate type 'Alt1'
tests/qapi-schema/alternate-nested.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/alternate-unknown.err +2 -2
index df05860bba..17fec1cd17 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/alternate-unknown.json: In alternate 'Alt':
-tests/qapi-schema/alternate-unknown.json:2: branch 'unknown' uses unknown type 'MissingType'
+alternate-unknown.json: In alternate 'Alt':
+alternate-unknown.json:2: branch 'unknown' uses unknown type 'MissingType'
tests/qapi-schema/alternate-unknown.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-alternate.err +2 -2
index 852b81b89c..b1530aa610 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-alternate.json: In command 'oops':
-tests/qapi-schema/args-alternate.json:3: command's 'data' cannot take alternate type 'Alt'
+args-alternate.json: In command 'oops':
+args-alternate.json:3: command's 'data' cannot take alternate type 'Alt'
tests/qapi-schema/args-alternate.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-any.err +2 -2
index 04e11df29f..4b60560247 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-any.json: In command 'oops':
-tests/qapi-schema/args-any.json:2: command's 'data' cannot take built-in type 'any'
+args-any.json: In command 'oops':
+args-any.json:2: command's 'data' cannot take built-in type 'any'
tests/qapi-schema/args-any.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-array-empty.err +2 -2
index c7d367730e..181222296e 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-array-empty.json: In command 'oops':
-tests/qapi-schema/args-array-empty.json:2: 'data' member 'empty': array type must contain single type name
+args-array-empty.json: In command 'oops':
+args-array-empty.json:2: 'data' member 'empty': array type must contain single type name
tests/qapi-schema/args-array-empty.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-array-unknown.err +2 -2
index 218fc4bf9a..cbc598e4ff 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-array-unknown.json: In command 'oops':
-tests/qapi-schema/args-array-unknown.json:2: command uses unknown type 'NoSuchType'
+args-array-unknown.json: In command 'oops':
+args-array-unknown.json:2: command uses unknown type 'NoSuchType'
tests/qapi-schema/args-array-unknown.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-bad-boxed.err +2 -2
index 31d39038fc..361276eb29 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-bad-boxed.json: In command 'foo':
-tests/qapi-schema/args-bad-boxed.json:2: flag 'boxed' may only use true value
+args-bad-boxed.json: In command 'foo':
+args-bad-boxed.json:2: flag 'boxed' may only use true value
tests/qapi-schema/args-bad-boxed.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-boxed-anon.err +2 -2
index 5e0c2979b7..a89af75bef 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-boxed-anon.json: In command 'foo':
-tests/qapi-schema/args-boxed-anon.json:2: 'data' should be a type name
+args-boxed-anon.json: In command 'foo':
+args-boxed-anon.json:2: 'data' should be a type name
tests/qapi-schema/args-boxed-anon.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-boxed-string.err +2 -2
index dc2b00f217..415c1148a9 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-boxed-string.json: In command 'foo':
-tests/qapi-schema/args-boxed-string.json:2: command's 'data' cannot take built-in type 'str'
+args-boxed-string.json: In command 'foo':
+args-boxed-string.json:2: command's 'data' cannot take built-in type 'str'
tests/qapi-schema/args-boxed-string.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-int.err +2 -2
index 81b6f86b66..a2331c5543 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-int.json: In command 'oops':
-tests/qapi-schema/args-int.json:2: command's 'data' cannot take built-in type 'int'
+args-int.json: In command 'oops':
+args-int.json:2: command's 'data' cannot take built-in type 'int'
tests/qapi-schema/args-int.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-invalid.err +2 -2
index c4971e1399..1527c4a48d 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-invalid.json: In command 'foo':
-tests/qapi-schema/args-invalid.json:1: 'data' should be an object or type name
+args-invalid.json: In command 'foo':
+args-invalid.json:1: 'data' should be an object or type name
tests/qapi-schema/args-invalid.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-member-array-bad.err +2 -2
index f95ac01372..194a3052d2 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-member-array-bad.json: In command 'oops':
-tests/qapi-schema/args-member-array-bad.json:2: 'data' member 'member': array type must contain single type name
+args-member-array-bad.json: In command 'oops':
+args-member-array-bad.json:2: 'data' member 'member': array type must contain single type name
tests/qapi-schema/args-member-array-bad.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-member-case.err +2 -2
index 3ecd276040..4f33dbbc38 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-member-case.json: In command 'no-way-this-will-get-whitelisted':
-tests/qapi-schema/args-member-case.json:2: 'data' member 'Arg' uses uppercase in name
+args-member-case.json: In command 'no-way-this-will-get-whitelisted':
+args-member-case.json:2: 'data' member 'Arg' uses uppercase in name
tests/qapi-schema/args-member-case.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-member-unknown.err +2 -2
index 0626e1209d..96b6e5d289 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-member-unknown.json: In command 'oops':
-tests/qapi-schema/args-member-unknown.json:2: parameter 'member' uses unknown type 'NoSuchType'
+args-member-unknown.json: In command 'oops':
+args-member-unknown.json:2: parameter 'member' uses unknown type 'NoSuchType'
tests/qapi-schema/args-member-unknown.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-name-clash.err +2 -2
index c5916a80fb..3e04817bc0 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-name-clash.json: In command 'oops':
-tests/qapi-schema/args-name-clash.json:4: parameter 'a_b' collides with parameter 'a-b'
+args-name-clash.json: In command 'oops':
+args-name-clash.json:4: parameter 'a_b' collides with parameter 'a-b'
tests/qapi-schema/args-name-clash.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-union.err +2 -2
index 3a77b2863f..4bf4955027 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-union.json: In command 'oops':
-tests/qapi-schema/args-union.json:3: command's 'data' can take union type 'Uni' only with 'boxed': true
+args-union.json: In command 'oops':
+args-union.json:3: command's 'data' can take union type 'Uni' only with 'boxed': true
tests/qapi-schema/args-union.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/args-unknown.err +2 -2
index 6857d6bf48..44bf8706ae 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/args-unknown.json: In command 'oops':
-tests/qapi-schema/args-unknown.json:2: command's 'data' uses unknown type 'NoSuchType'
+args-unknown.json: In command 'oops':
+args-unknown.json:2: command's 'data' uses unknown type 'NoSuchType'
tests/qapi-schema/args-unknown.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/bad-base.err +2 -2
index 039678a364..61a1efc2c0 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/bad-base.json: In struct 'MyType':
-tests/qapi-schema/bad-base.json:3: 'base' requires a struct type, union type 'Union' isn't
+bad-base.json: In struct 'MyType':
+bad-base.json:3: 'base' requires a struct type, union type 'Union' isn't
tests/qapi-schema/bad-base.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/bad-data.err +2 -2
index 5227bdce7e..7991c8898d 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/bad-data.json: In command 'oops':
-tests/qapi-schema/bad-data.json:2: 'data' cannot be an array
+bad-data.json: In command 'oops':
+bad-data.json:2: 'data' cannot be an array
tests/qapi-schema/bad-data.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/bad-ident.err +2 -2
index ad38a679c7..263fcd3ecd 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/bad-ident.json: In struct '*oops':
-tests/qapi-schema/bad-ident.json:2: struct has an invalid name
+bad-ident.json: In struct '*oops':
+bad-ident.json:2: struct has an invalid name
tests/qapi-schema/bad-ident.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/bad-if-empty-list.err +2 -2
index 517519f500..a946376d06 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/bad-if-empty-list.json: In struct 'TestIfStruct':
-tests/qapi-schema/bad-if-empty-list.json:2: 'if' condition [] of struct is useless
+bad-if-empty-list.json: In struct 'TestIfStruct':
+bad-if-empty-list.json:2: 'if' condition [] of struct is useless
tests/qapi-schema/bad-if-empty-list.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/bad-if-empty.err +2 -2
index 5f1767388e..a0f3effefb 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/bad-if-empty.json: In struct 'TestIfStruct':
-tests/qapi-schema/bad-if-empty.json:2: 'if' condition '' of struct makes no sense
+bad-if-empty.json: In struct 'TestIfStruct':
+bad-if-empty.json:2: 'if' condition '' of struct makes no sense
tests/qapi-schema/bad-if-empty.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/bad-if-list.err +2 -2
index e5d72b2f39..c462f11b90 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/bad-if-list.json: In struct 'TestIfStruct':
-tests/qapi-schema/bad-if-list.json:2: 'if' condition ' ' of struct makes no sense
+bad-if-list.json: In struct 'TestIfStruct':
+bad-if-list.json:2: 'if' condition ' ' of struct makes no sense
tests/qapi-schema/bad-if-list.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/bad-if.err +2 -2
index 65d8efd7e4..f83dee65da 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/bad-if.json: In struct 'TestIfStruct':
-tests/qapi-schema/bad-if.json:2: 'if' condition of struct must be a string or a list of strings
+bad-if.json: In struct 'TestIfStruct':
+bad-if.json:2: 'if' condition of struct must be a string or a list of strings
tests/qapi-schema/bad-if.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/bad-type-bool.err +1 -1
index 984a77c4e3..42ccc18988 100644
@@ -1 +1 @@
-tests/qapi-schema/bad-type-bool.json:2: 'struct' requires a string name
+bad-type-bool.json:2: 'struct' requires a string name
tests/qapi-schema/bad-type-bool.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/bad-type-dict.err +1 -1
index e83b8cfb41..3d97cd3f0a 100644
@@ -1 +1 @@
-tests/qapi-schema/bad-type-dict.json:2: 'command' requires a string name
+bad-type-dict.json:2: 'command' requires a string name
tests/qapi-schema/bad-type-dict.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/bad-type-int.err +1 -1
index 7f5916ea29..90d06bd94d 100644
@@ -1 +1 @@
-tests/qapi-schema/bad-type-int.json:3:13: stray '123'
+bad-type-int.json:3:13: stray '123'
tests/qapi-schema/bad-type-int.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/base-cycle-direct.err +2 -2
index 233e4b8952..4ea6c5064e 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/base-cycle-direct.json: In struct 'Loopy':
-tests/qapi-schema/base-cycle-direct.json:2: object Loopy contains itself
+base-cycle-direct.json: In struct 'Loopy':
+base-cycle-direct.json:2: object Loopy contains itself
tests/qapi-schema/base-cycle-direct.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/base-cycle-indirect.err +2 -2
index 4472f30ba1..9b5e7ec174 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/base-cycle-indirect.json: In struct 'Base1':
-tests/qapi-schema/base-cycle-indirect.json:2: object Base1 contains itself
+base-cycle-indirect.json: In struct 'Base1':
+base-cycle-indirect.json:2: object Base1 contains itself
tests/qapi-schema/base-cycle-indirect.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/command-int.err +2 -2
index 3523d50a79..df0e5f5a57 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/command-int.json: In command 'int':
-tests/qapi-schema/command-int.json:2: built-in type 'int' is already defined
+command-int.json: In command 'int':
+command-int.json:2: built-in type 'int' is already defined
tests/qapi-schema/command-int.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/comments.exit deleted +0 -1
deleted file mode 100644
index 573541ac97..0000000000
@@ -1 +0,0 @@
-0
tests/qapi-schema/doc-bad-alternate-member.err +1 -1
index 19a1ffd76e..a1c282f935 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-bad-alternate-member.json:3: the following documented members are not in the declaration: aa, bb
+doc-bad-alternate-member.json:3: the following documented members are not in the declaration: aa, bb
tests/qapi-schema/doc-bad-alternate-member.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-bad-command-arg.err +1 -1
index 6962ebed69..153ea0330a 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-bad-command-arg.json:3: the following documented members are not in the declaration: b
+doc-bad-command-arg.json:3: the following documented members are not in the declaration: b
tests/qapi-schema/doc-bad-command-arg.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-bad-section.exit deleted +0 -1
deleted file mode 100644
index 573541ac97..0000000000
@@ -1 +0,0 @@
-0
tests/qapi-schema/doc-bad-symbol.err +2 -2
index b23e99d160..166c8dcc18 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/doc-bad-symbol.json: In command 'foo':
-tests/qapi-schema/doc-bad-symbol.json:6: documentation comment is for 'food'
+doc-bad-symbol.json: In command 'foo':
+doc-bad-symbol.json:6: documentation comment is for 'food'
tests/qapi-schema/doc-bad-symbol.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-bad-union-member.err +1 -1
index da3cd806e3..8b9d36eab1 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-bad-union-member.json:3: the following documented members are not in the declaration: a, b
+doc-bad-union-member.json:3: the following documented members are not in the declaration: a, b
tests/qapi-schema/doc-bad-union-member.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-before-include.err +1 -1
index e5566f11e9..ae23ea2f57 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-before-include.json:3: documentation for 'foo' is not followed by the definition
+doc-before-include.json:3: documentation for 'foo' is not followed by the definition
tests/qapi-schema/doc-before-include.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-before-pragma.err +1 -1
index 8a97ebb578..c776252e07 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-before-pragma.json:3: documentation for 'foo' is not followed by the definition
+doc-before-pragma.json:3: documentation for 'foo' is not followed by the definition
tests/qapi-schema/doc-before-pragma.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-duplicated-arg.err +1 -1
index 1c3f8e0a54..0d0d777a1f 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-duplicated-arg.json:6:1: 'a' parameter name duplicated
+doc-duplicated-arg.json:6:1: 'a' parameter name duplicated
tests/qapi-schema/doc-duplicated-arg.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-duplicated-return.err +1 -1
index 7631933093..fe97e3db8d 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-duplicated-return.json:7:1: duplicated 'Returns' section
+doc-duplicated-return.json:7:1: duplicated 'Returns' section
tests/qapi-schema/doc-duplicated-return.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-duplicated-since.err +1 -1
index 5ee15ae2a1..abca141a2c 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-duplicated-since.json:7:1: duplicated 'Since' section
+doc-duplicated-since.json:7:1: duplicated 'Since' section
tests/qapi-schema/doc-duplicated-since.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-empty-arg.err +1 -1
index 3c78a37ae1..2d0f35f310 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-empty-arg.json:5:1: invalid parameter name
+doc-empty-arg.json:5:1: invalid parameter name
tests/qapi-schema/doc-empty-arg.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-empty-section.err +1 -1
index f6586c566f..ba7ba70125 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-empty-section.json:7:1: empty doc section 'Note'
+doc-empty-section.json:7:1: empty doc section 'Note'
tests/qapi-schema/doc-empty-section.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-empty-symbol.err +1 -1
index 2dcddca7f6..81b90e882a 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-empty-symbol.json:4:1: invalid name
+doc-empty-symbol.json:4:1: invalid name
tests/qapi-schema/doc-empty-symbol.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-good.exit deleted +0 -1
deleted file mode 100644
index 573541ac97..0000000000
@@ -1 +0,0 @@
-0
tests/qapi-schema/doc-interleaved-section.err +1 -1
index d373eabc55..715d58cd31 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-interleaved-section.json:15:1: '@foobar:' can't follow 'Note' section
+doc-interleaved-section.json:15:1: '@foobar:' can't follow 'Note' section
tests/qapi-schema/doc-interleaved-section.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-invalid-end.err +1 -1
index 6345aa6a0f..919e4d317e 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-invalid-end.json:5:2: documentation comment must end with '##'
+doc-invalid-end.json:5:2: documentation comment must end with '##'
tests/qapi-schema/doc-invalid-end.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-invalid-end2.err +1 -1
index 13ead36fd2..d88a15cc8a 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-invalid-end2.json:5:1: junk after '##' at end of documentation comment
+doc-invalid-end2.json:5:1: junk after '##' at end of documentation comment
tests/qapi-schema/doc-invalid-end2.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-invalid-return.err +1 -1
index 5aaba33bb4..2ad89c5941 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-invalid-return.json:3: 'Returns:' is only valid for commands
+doc-invalid-return.json:3: 'Returns:' is only valid for commands
tests/qapi-schema/doc-invalid-return.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-invalid-section.err +1 -1
index bda93b44fd..d2d40e5704 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-invalid-section.json:5:1: '@note:' not allowed in free-form documentation
+doc-invalid-section.json:5:1: '@note:' not allowed in free-form documentation
tests/qapi-schema/doc-invalid-section.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-invalid-start.err +1 -1
index dcaa9699d6..276c033600 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-invalid-start.json:3:1: junk after '##' at start of documentation comment
+doc-invalid-start.json:3:1: junk after '##' at start of documentation comment
tests/qapi-schema/doc-invalid-start.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-missing-colon.err +1 -1
index 6fb5a380bd..cbcea00715 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-missing-colon.json:4:1: line should end with ':'
+doc-missing-colon.json:4:1: line should end with ':'
tests/qapi-schema/doc-missing-colon.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-missing-expr.err +1 -1
index 622a37cc6c..c9b32a96fa 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-missing-expr.json:3: documentation for 'bar' is not followed by the definition
+doc-missing-expr.json:3: documentation for 'bar' is not followed by the definition
tests/qapi-schema/doc-missing-expr.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-missing-space.err +1 -1
index 1187ba12c4..350031d1d6 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-missing-space.json:5:1: missing space after #
+doc-missing-space.json:5:1: missing space after #
tests/qapi-schema/doc-missing-space.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-missing.err +2 -2
index 7fbf54ff65..b89d925bcc 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/doc-missing.json: In command 'undocumented':
-tests/qapi-schema/doc-missing.json:5: documentation comment required
+doc-missing.json: In command 'undocumented':
+doc-missing.json:5: documentation comment required
tests/qapi-schema/doc-missing.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/doc-no-symbol.err +1 -1
index 9a3057730c..1b4fa14a22 100644
@@ -1 +1 @@
-tests/qapi-schema/doc-no-symbol.json:3: definition documentation required
+doc-no-symbol.json:3: definition documentation required
tests/qapi-schema/doc-no-symbol.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/double-type.err +2 -2
index 23f88aae99..71fc4dbb52 100644
@@ -1,3 +1,3 @@
-tests/qapi-schema/double-type.json: In struct 'bar':
-tests/qapi-schema/double-type.json:2: struct has unknown key 'command'
+double-type.json: In struct 'bar':
+double-type.json:2: struct has unknown key 'command'
 Valid keys are 'base', 'data', 'features', 'if', 'struct'.
tests/qapi-schema/double-type.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/duplicate-key.err +1 -1
index 7f34a34eb6..7ea8e95e8c 100644
@@ -1 +1 @@
-tests/qapi-schema/duplicate-key.json:3:10: duplicate key 'key'
+duplicate-key.json:3:10: duplicate key 'key'
tests/qapi-schema/duplicate-key.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/empty.exit deleted +0 -1
deleted file mode 100644
index 573541ac97..0000000000
@@ -1 +0,0 @@
-0
tests/qapi-schema/enum-bad-member.err +2 -2
index 2b1b4f98d0..f75d8c56ff 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/enum-bad-member.json: In enum 'MyEnum':
-tests/qapi-schema/enum-bad-member.json:2: 'data' member requires a string name
+enum-bad-member.json: In enum 'MyEnum':
+enum-bad-member.json:2: 'data' member requires a string name
tests/qapi-schema/enum-bad-member.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/enum-bad-name.err +2 -2
index 3273a9808a..d26044b8e3 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/enum-bad-name.json: In enum 'MyEnum':
-tests/qapi-schema/enum-bad-name.json:3: 'data' member 'not\possible' has an invalid name
+enum-bad-name.json: In enum 'MyEnum':
+enum-bad-name.json:3: 'data' member 'not\possible' has an invalid name
tests/qapi-schema/enum-bad-name.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/enum-bad-prefix.err +2 -2
index 933e33aa18..7a2b35787e 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/enum-bad-prefix.json: In enum 'MyEnum':
-tests/qapi-schema/enum-bad-prefix.json:2: 'prefix' must be a string
+enum-bad-prefix.json: In enum 'MyEnum':
+enum-bad-prefix.json:2: 'prefix' must be a string
tests/qapi-schema/enum-bad-prefix.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/enum-clash-member.err +2 -2
index 84e02db82c..5986571427 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/enum-clash-member.json: In enum 'MyEnum':
-tests/qapi-schema/enum-clash-member.json:2: value 'one_two' collides with value 'one-two'
+enum-clash-member.json: In enum 'MyEnum':
+enum-clash-member.json:2: value 'one_two' collides with value 'one-two'
tests/qapi-schema/enum-clash-member.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/enum-dict-member-unknown.err +2 -2
index 5df0236343..f8617ea179 100644
@@ -1,3 +1,3 @@
-tests/qapi-schema/enum-dict-member-unknown.json: In enum 'MyEnum':
-tests/qapi-schema/enum-dict-member-unknown.json:2: 'data' member has unknown key 'bad-key'
+enum-dict-member-unknown.json: In enum 'MyEnum':
+enum-dict-member-unknown.json:2: 'data' member has unknown key 'bad-key'
 Valid keys are 'if', 'name'.
tests/qapi-schema/enum-dict-member-unknown.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/enum-if-invalid.err +2 -2
index 30c1f0e91c..0556dc967b 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/enum-if-invalid.json: In enum 'TestIfEnum':
-tests/qapi-schema/enum-if-invalid.json:2: 'if' condition of 'data' member 'bar' must be a string or a list of strings
+enum-if-invalid.json: In enum 'TestIfEnum':
+enum-if-invalid.json:2: 'if' condition of 'data' member 'bar' must be a string or a list of strings
tests/qapi-schema/enum-if-invalid.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/enum-int-member.err +1 -1
index 27f06e334c..3a15294963 100644
@@ -1 +1 @@
-tests/qapi-schema/enum-int-member.json:3:31: stray '1'
+enum-int-member.json:3:31: stray '1'
tests/qapi-schema/enum-int-member.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/enum-member-case.err +2 -2
index e6b080c6e5..8b3aefe37a 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/enum-member-case.json: In enum 'NoWayThisWillGetWhitelisted':
-tests/qapi-schema/enum-member-case.json:4: 'data' member 'Value' uses uppercase in name
+enum-member-case.json: In enum 'NoWayThisWillGetWhitelisted':
+enum-member-case.json:4: 'data' member 'Value' uses uppercase in name
tests/qapi-schema/enum-member-case.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/enum-missing-data.err +2 -2
index 4809b01f34..ec4bdae037 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/enum-missing-data.json: In enum 'MyEnum':
-tests/qapi-schema/enum-missing-data.json:2: enum misses key 'data'
+enum-missing-data.json: In enum 'MyEnum':
+enum-missing-data.json:2: enum misses key 'data'
tests/qapi-schema/enum-missing-data.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/enum-wrong-data.err +2 -2
index ad5f0ce46f..a9f34481ba 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/enum-wrong-data.json: In enum 'MyEnum':
-tests/qapi-schema/enum-wrong-data.json:2: 'data' must be an array
+enum-wrong-data.json: In enum 'MyEnum':
+enum-wrong-data.json:2: 'data' must be an array
tests/qapi-schema/enum-wrong-data.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/escape-outside-string.err +1 -1
index 06f5f2ed55..c49fe0c285 100644
@@ -1 +1 @@
-tests/qapi-schema/escape-outside-string.json:3:27: stray '\'
+escape-outside-string.json:3:27: stray '\'
tests/qapi-schema/event-boxed-empty.err +2 -2
index 931c10b036..b3872cdab5 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/event-boxed-empty.json: In event 'FOO':
-tests/qapi-schema/event-boxed-empty.json:2: 'boxed': true requires 'data'
+event-boxed-empty.json: In event 'FOO':
+event-boxed-empty.json:2: 'boxed': true requires 'data'
tests/qapi-schema/event-boxed-empty.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/event-case.exit deleted +0 -1
deleted file mode 100644
index 573541ac97..0000000000
@@ -1 +0,0 @@
-0
tests/qapi-schema/event-member-invalid-dict.err +2 -2
index 8406c43df7..c7a6a24305 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/event-member-invalid-dict.json: In event 'EVENT_A':
-tests/qapi-schema/event-member-invalid-dict.json:1: 'data' member 'a' misses key 'type'
+event-member-invalid-dict.json: In event 'EVENT_A':
+event-member-invalid-dict.json:1: 'data' member 'a' misses key 'type'
tests/qapi-schema/event-member-invalid-dict.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/event-nest-struct.err +2 -2
index 1a3254a73c..8c5f6ed311 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/event-nest-struct.json: In event 'EVENT_A':
-tests/qapi-schema/event-nest-struct.json:1: 'data' member 'a' should be a type name
+event-nest-struct.json: In event 'EVENT_A':
+event-nest-struct.json:1: 'data' member 'a' should be a type name
tests/qapi-schema/event-nest-struct.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/features-bad-type.err +2 -2
index 30deb8b624..3c63591632 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/features-bad-type.json: In struct 'FeatureStruct0':
-tests/qapi-schema/features-bad-type.json:1: 'features' member requires a string name
+features-bad-type.json: In struct 'FeatureStruct0':
+features-bad-type.json:1: 'features' member requires a string name
tests/qapi-schema/features-bad-type.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/features-duplicate-name.err +2 -2
index a99bbde737..0adbee6b0a 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/features-duplicate-name.json: In struct 'FeatureStruct0':
-tests/qapi-schema/features-duplicate-name.json:1: feature 'foo' collides with feature 'foo'
+features-duplicate-name.json: In struct 'FeatureStruct0':
+features-duplicate-name.json:1: feature 'foo' collides with feature 'foo'
tests/qapi-schema/features-duplicate-name.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/features-if-invalid.err +2 -2
index ffb39378af..f63b89535e 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/features-if-invalid.json: In struct 'Stru':
-tests/qapi-schema/features-if-invalid.json:2: 'if' condition of 'features' member 'f' must be a string or a list of strings
+features-if-invalid.json: In struct 'Stru':
+features-if-invalid.json:2: 'if' condition of 'features' member 'f' must be a string or a list of strings
tests/qapi-schema/features-if-invalid.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/features-missing-name.err +2 -2
index b8db328acc..ce02412d2e 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/features-missing-name.json: In struct 'FeatureStruct0':
-tests/qapi-schema/features-missing-name.json:1: 'features' member misses key 'name'
+features-missing-name.json: In struct 'FeatureStruct0':
+features-missing-name.json:1: 'features' member misses key 'name'
tests/qapi-schema/features-missing-name.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/features-name-bad-type.err +2 -2
index 86db2c0ea2..4afcd5fdc3 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/features-name-bad-type.json: In struct 'FeatureStruct0':
-tests/qapi-schema/features-name-bad-type.json:1: 'features' member requires a string name
+features-name-bad-type.json: In struct 'FeatureStruct0':
+features-name-bad-type.json:1: 'features' member requires a string name
tests/qapi-schema/features-name-bad-type.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/features-no-list.err +2 -2
index e493f85057..5cfaa3f216 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/features-no-list.json: In struct 'FeatureStruct0':
-tests/qapi-schema/features-no-list.json:1: 'features' must be an array
+features-no-list.json: In struct 'FeatureStruct0':
+features-no-list.json:1: 'features' must be an array
tests/qapi-schema/features-no-list.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/features-unknown-key.err +2 -2
index 22f5dcf4b0..13e359a216 100644
@@ -1,3 +1,3 @@
-tests/qapi-schema/features-unknown-key.json: In struct 'FeatureStruct0':
-tests/qapi-schema/features-unknown-key.json:1: 'features' member has unknown key 'colour'
+features-unknown-key.json: In struct 'FeatureStruct0':
+features-unknown-key.json:1: 'features' member has unknown key 'colour'
 Valid keys are 'if', 'name'.
tests/qapi-schema/features-unknown-key.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-array-branch.err +2 -2
index de07a7b32a..20a8ef1406 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-array-branch.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-array-branch.json:8: 'data' member 'value1' cannot be an array
+flat-union-array-branch.json: In union 'TestUnion':
+flat-union-array-branch.json:8: 'data' member 'value1' cannot be an array
tests/qapi-schema/flat-union-array-branch.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-bad-base.err +2 -2
index 5da7602c20..e0a205a58c 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-bad-base.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-bad-base.json:8: member 'string' of type 'TestTypeA' collides with base member 'string'
+flat-union-bad-base.json: In union 'TestUnion':
+flat-union-bad-base.json:8: member 'string' of type 'TestTypeA' collides with base member 'string'
tests/qapi-schema/flat-union-bad-base.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-bad-discriminator.err +2 -2
index c1b4209ffd..b705439bd9 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-bad-discriminator.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-bad-discriminator.json:11: 'discriminator' requires a string name
+flat-union-bad-discriminator.json: In union 'TestUnion':
+flat-union-bad-discriminator.json:11: 'discriminator' requires a string name
tests/qapi-schema/flat-union-bad-discriminator.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-base-any.err +2 -2
index 7ab3402396..c2d4de6a5d 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-base-any.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-base-any.json:8: 'base' requires a struct type, built-in type 'any' isn't
+flat-union-base-any.json: In union 'TestUnion':
+flat-union-base-any.json:8: 'base' requires a struct type, built-in type 'any' isn't
tests/qapi-schema/flat-union-base-any.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-base-union.err +2 -2
index 5db7b1e404..3b0087220e 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-base-union.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-base-union.json:14: 'base' requires a struct type, union type 'UnionBase' isn't
+flat-union-base-union.json: In union 'TestUnion':
+flat-union-base-union.json:14: 'base' requires a struct type, union type 'UnionBase' isn't
tests/qapi-schema/flat-union-base-union.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-clash-member.err +2 -2
index 40f10681f8..07551e6ef5 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-clash-member.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-clash-member.json:11: member 'name' of type 'Branch1' collides with member 'name' of type 'Base'
+flat-union-clash-member.json: In union 'TestUnion':
+flat-union-clash-member.json:11: member 'name' of type 'Branch1' collides with member 'name' of type 'Base'
tests/qapi-schema/flat-union-clash-member.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-discriminator-bad-name.err +2 -2
index 2a0deb6a0e..28be49c31a 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-discriminator-bad-name.json: In union 'MyUnion':
-tests/qapi-schema/flat-union-discriminator-bad-name.json:6: discriminator '*switch' is not a member of 'base'
+flat-union-discriminator-bad-name.json: In union 'MyUnion':
+flat-union-discriminator-bad-name.json:6: discriminator '*switch' is not a member of 'base'
tests/qapi-schema/flat-union-discriminator-bad-name.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-empty.err +2 -2
index 91a5b57f5d..89b0f25cb0 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-empty.json: In union 'Union':
-tests/qapi-schema/flat-union-empty.json:4: union has no branches
+flat-union-empty.json: In union 'Union':
+flat-union-empty.json:4: union has no branches
tests/qapi-schema/flat-union-empty.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-inline-invalid-dict.err +2 -2
index d353bdd338..53e5416707 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-inline-invalid-dict.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-inline-invalid-dict.json:7: 'data' member 'value1' misses key 'type'
+flat-union-inline-invalid-dict.json: In union 'TestUnion':
+flat-union-inline-invalid-dict.json:7: 'data' member 'value1' misses key 'type'
tests/qapi-schema/flat-union-inline-invalid-dict.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-inline.err +2 -2
index 95b1e8c1b7..538283f5db 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-inline.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-inline.json:7: 'data' member 'value1' should be a type name
+flat-union-inline.json: In union 'TestUnion':
+flat-union-inline.json:7: 'data' member 'value1' should be a type name
tests/qapi-schema/flat-union-inline.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-int-branch.err +2 -2
index 416b696c8f..ae7f800603 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-int-branch.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-int-branch.json:8: branch 'value1' cannot use built-in type 'int'
+flat-union-int-branch.json: In union 'TestUnion':
+flat-union-int-branch.json:8: branch 'value1' cannot use built-in type 'int'
tests/qapi-schema/flat-union-int-branch.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-invalid-branch-key.err +2 -2
index 6997b3387d..5576a25f9b 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-invalid-branch-key.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-invalid-branch-key.json:13: branch 'value_wrong' is not a value of enum type 'TestEnum'
+flat-union-invalid-branch-key.json: In union 'TestUnion':
+flat-union-invalid-branch-key.json:13: branch 'value_wrong' is not a value of enum type 'TestEnum'
tests/qapi-schema/flat-union-invalid-branch-key.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-invalid-discriminator.err +2 -2
index 3f80de3044..99bca2ddab 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-invalid-discriminator.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-invalid-discriminator.json:10: discriminator 'enum_wrong' is not a member of 'base'
+flat-union-invalid-discriminator.json: In union 'TestUnion':
+flat-union-invalid-discriminator.json:10: discriminator 'enum_wrong' is not a member of 'base'
tests/qapi-schema/flat-union-invalid-discriminator.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-invalid-if-discriminator.err +2 -2
index d2b35be9ae..350f28da9d 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-invalid-if-discriminator.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-invalid-if-discriminator.json:10: discriminator member 'enum1' of 'base' must not be conditional
+flat-union-invalid-if-discriminator.json: In union 'TestUnion':
+flat-union-invalid-if-discriminator.json:10: discriminator member 'enum1' of 'base' must not be conditional
tests/qapi-schema/flat-union-invalid-if-discriminator.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-no-base.err +2 -2
index a16f3231f1..9bd595bcfb 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-no-base.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-no-base.json:9: 'discriminator' requires 'base'
+flat-union-no-base.json: In union 'TestUnion':
+flat-union-no-base.json:9: 'discriminator' requires 'base'
tests/qapi-schema/flat-union-no-base.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-optional-discriminator.err +2 -2
index 49fbf5b04d..3d60a1b496 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-optional-discriminator.json: In union 'MyUnion':
-tests/qapi-schema/flat-union-optional-discriminator.json:6: discriminator member 'switch' of base type 'Base' must not be optional
+flat-union-optional-discriminator.json: In union 'MyUnion':
+flat-union-optional-discriminator.json:6: discriminator member 'switch' of base type 'Base' must not be optional
tests/qapi-schema/flat-union-optional-discriminator.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/flat-union-string-discriminator.err +2 -2
index fb499188aa..ff42c9728b 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/flat-union-string-discriminator.json: In union 'TestUnion':
-tests/qapi-schema/flat-union-string-discriminator.json:13: discriminator member 'kind' of base type 'TestBase' must be of enum type
+flat-union-string-discriminator.json: In union 'TestUnion':
+flat-union-string-discriminator.json:13: discriminator member 'kind' of base type 'TestBase' must be of enum type
tests/qapi-schema/flat-union-string-discriminator.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/funny-char.err +1 -1
index 132fac93ea..1c8abae2e0 100644
@@ -1 +1 @@
-tests/qapi-schema/funny-char.json:2:36: stray ';'
+funny-char.json:2:36: stray ';'
tests/qapi-schema/funny-char.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/funny-word.err +1 -1
index d9286c8962..a1d9ade970 100644
@@ -1 +1 @@
-tests/qapi-schema/funny-word.json:1:3: stray 'command'
+funny-word.json:1:3: stray 'command'
tests/qapi-schema/funny-word.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/ident-with-escape.err +1 -1
index 1117283c81..3f6c1e423c 100644
@@ -1 +1 @@
-tests/qapi-schema/ident-with-escape.json:3:3: unknown escape \u
+ident-with-escape.json:3:3: unknown escape \u
tests/qapi-schema/ident-with-escape.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/include-before-err.err +1 -1
index 098314bc49..16da03026f 100644
@@ -1 +1 @@
-tests/qapi-schema/include-before-err.json:2:13: expected ':'
+include-before-err.json:2:13: expected ':'
tests/qapi-schema/include-before-err.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/include-cycle.err +3 -3
index 52028669b5..4c99f5642b 100644
@@ -1,3 +1,3 @@
-In file included from tests/qapi-schema/include-cycle.json:1:
-In file included from tests/qapi-schema/include-cycle-b.json:1:
-tests/qapi-schema/include-cycle-c.json:1: inclusion loop for include-cycle.json
+In file included from include-cycle.json:1:
+In file included from include-cycle-b.json:1:
+include-cycle-c.json:1: inclusion loop for include-cycle.json
tests/qapi-schema/include-cycle.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/include-extra-junk.err +1 -1
index 854cec3ce3..1f7d2e1437 100644
@@ -1 +1 @@
-tests/qapi-schema/include-extra-junk.json:3: invalid 'include' directive
+include-extra-junk.json:3: invalid 'include' directive
tests/qapi-schema/include-extra-junk.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/include-nested-err.err +2 -2
index 11928b4f7f..9eac9eaeea 100644
@@ -1,2 +1,2 @@
-In file included from tests/qapi-schema/include-nested-err.json:1:
-tests/qapi-schema/missing-colon.json:1:10: expected ':'
+In file included from include-nested-err.json:1:
+missing-colon.json:1:10: expected ':'
tests/qapi-schema/include-nested-err.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/include-no-file.err +1 -1
index 0a6c6bb4a9..3115a889fe 100644
@@ -1 +1 @@
-tests/qapi-schema/include-no-file.json:1: can't read include file 'tests/qapi-schema/include-no-file-sub.json': No such file or directory
+include-no-file.json:1: can't read include file 'include-no-file-sub.json': No such file or directory
tests/qapi-schema/include-no-file.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/include-non-file.err +1 -1
index 65dd3c7c2c..ec8a331654 100644
@@ -1 +1 @@
-tests/qapi-schema/include-non-file.json:1: value of 'include' must be a string
+include-non-file.json:1: value of 'include' must be a string
tests/qapi-schema/include-non-file.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/include-repetition.exit deleted +0 -1
deleted file mode 100644
index 573541ac97..0000000000
@@ -1 +0,0 @@
-0
tests/qapi-schema/include-self-cycle.err +1 -1
index c84795d1dc..284b0d6f0e 100644
@@ -1 +1 @@
-tests/qapi-schema/include-self-cycle.json:1: inclusion loop for include-self-cycle.json
+include-self-cycle.json:1: inclusion loop for include-self-cycle.json
tests/qapi-schema/include-self-cycle.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/include-simple.exit deleted +0 -1
deleted file mode 100644
index 573541ac97..0000000000
@@ -1 +0,0 @@
-0
tests/qapi-schema/indented-expr.exit deleted +0 -1
deleted file mode 100644
index 573541ac97..0000000000
@@ -1 +0,0 @@
-0
tests/qapi-schema/leading-comma-list.err +1 -1
index cddf471f71..76eed2b5b3 100644
@@ -1 +1 @@
-tests/qapi-schema/leading-comma-list.json:2:13: expected '{', '[', ']', string, boolean or 'null'
+leading-comma-list.json:2:13: expected '{', '[', ']', string, boolean or 'null'
tests/qapi-schema/leading-comma-list.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/leading-comma-object.err +1 -1
index 2f3b193274..25f8b6ffd6 100644
@@ -1 +1 @@
-tests/qapi-schema/leading-comma-object.json:1:3: expected string or '}'
+leading-comma-object.json:1:3: expected string or '}'
tests/qapi-schema/leading-comma-object.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/missing-colon.err +1 -1
index e642c7c549..d5fe235cb9 100644
@@ -1 +1 @@
-tests/qapi-schema/missing-colon.json:1:10: expected ':'
+missing-colon.json:1:10: expected ':'
tests/qapi-schema/missing-colon.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/missing-comma-list.err +1 -1
index 5359499430..d0a790c2b3 100644
@@ -1 +1 @@
-tests/qapi-schema/missing-comma-list.json:2:20: expected ',' or ']'
+missing-comma-list.json:2:20: expected ',' or ']'
tests/qapi-schema/missing-comma-list.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/missing-comma-object.err +1 -1
index c9b02b0760..aa8efbc2f3 100644
@@ -1 +1 @@
-tests/qapi-schema/missing-comma-object.json:2:3: expected ',' or '}'
+missing-comma-object.json:2:3: expected ',' or '}'
tests/qapi-schema/missing-comma-object.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/missing-type.err +1 -1
index 19b7c495e7..5755386a18 100644
@@ -1 +1 @@
-tests/qapi-schema/missing-type.json:2: expression is missing metatype
+missing-type.json:2: expression is missing metatype
tests/qapi-schema/missing-type.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/nested-struct-data-invalid-dict.err +2 -2
index ed42d6323e..c044b2b17a 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/nested-struct-data-invalid-dict.json: In command 'foo':
-tests/qapi-schema/nested-struct-data-invalid-dict.json:2: 'data' member 'a' misses key 'type'
+nested-struct-data-invalid-dict.json: In command 'foo':
+nested-struct-data-invalid-dict.json:2: 'data' member 'a' misses key 'type'
tests/qapi-schema/nested-struct-data-invalid-dict.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/nested-struct-data.err +2 -2
index b0ec410eb7..c7258a0182 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/nested-struct-data.json: In command 'foo':
-tests/qapi-schema/nested-struct-data.json:2: 'data' member 'a' should be a type name
+nested-struct-data.json: In command 'foo':
+nested-struct-data.json:2: 'data' member 'a' should be a type name
tests/qapi-schema/nested-struct-data.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/non-objects.err +1 -1
index 9237af6939..3a4ea36966 100644
@@ -1 +1 @@
-tests/qapi-schema/non-objects.json:1:1: expected '{'
+non-objects.json:1:1: expected '{'
tests/qapi-schema/non-objects.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/oob-test.err +2 -2
index 3c2ba6e0fd..7b9a50b3d5 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/oob-test.json: In command 'oob-command-1':
-tests/qapi-schema/oob-test.json:2: flag 'allow-oob' may only use true value
+oob-test.json: In command 'oob-command-1':
+oob-test.json:2: flag 'allow-oob' may only use true value
tests/qapi-schema/oob-test.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/pragma-doc-required-crap.err +1 -1
index bcd981ada8..717062cb14 100644
@@ -1 +1 @@
-tests/qapi-schema/pragma-doc-required-crap.json:3: pragma 'doc-required' must be boolean
+pragma-doc-required-crap.json:3: pragma 'doc-required' must be boolean
tests/qapi-schema/pragma-doc-required-crap.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/pragma-extra-junk.err +1 -1
index 3ae48d3668..ba5cc23f56 100644
@@ -1 +1 @@
-tests/qapi-schema/pragma-extra-junk.json:3: invalid 'pragma' directive
+pragma-extra-junk.json:3: invalid 'pragma' directive
tests/qapi-schema/pragma-extra-junk.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/pragma-name-case-whitelist-crap.err +1 -1
index 81f829ff36..fbea90d6c5 100644
@@ -1 +1 @@
-tests/qapi-schema/pragma-name-case-whitelist-crap.json:3: pragma name-case-whitelist must be a list of strings
+pragma-name-case-whitelist-crap.json:3: pragma name-case-whitelist must be a list of strings
tests/qapi-schema/pragma-name-case-whitelist-crap.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/pragma-non-dict.err +1 -1
index 8221724b0a..802f1806c5 100644
@@ -1 +1 @@
-tests/qapi-schema/pragma-non-dict.json:3: value of 'pragma' must be an object
+pragma-non-dict.json:3: value of 'pragma' must be an object
tests/qapi-schema/pragma-non-dict.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/pragma-returns-whitelist-crap.err +1 -1
index c0cae5de18..69784259df 100644
@@ -1 +1 @@
-tests/qapi-schema/pragma-returns-whitelist-crap.json:3: pragma returns-whitelist must be a list of strings
+pragma-returns-whitelist-crap.json:3: pragma returns-whitelist must be a list of strings
tests/qapi-schema/pragma-returns-whitelist-crap.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/pragma-unknown.err +1 -1
index f1335f0a0a..d99a772503 100644
@@ -1 +1 @@
-tests/qapi-schema/pragma-unknown.json:1: unknown pragma 'no-such-pragma'
+pragma-unknown.json:1: unknown pragma 'no-such-pragma'
tests/qapi-schema/pragma-unknown.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/qapi-schema-test.exit deleted +0 -1
deleted file mode 100644
index 573541ac97..0000000000
@@ -1 +0,0 @@
-0
tests/qapi-schema/quoted-structural-chars.err +1 -1
index d8460a63a7..07d1561d1f 100644
@@ -1 +1 @@
-tests/qapi-schema/quoted-structural-chars.json:1:1: expected '{'
+quoted-structural-chars.json:1:1: expected '{'
tests/qapi-schema/quoted-structural-chars.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/redefined-builtin.err +2 -2
index 47c8933759..58c7e42ffc 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/redefined-builtin.json: In struct 'size':
-tests/qapi-schema/redefined-builtin.json:2: built-in type 'size' is already defined
+redefined-builtin.json: In struct 'size':
+redefined-builtin.json:2: built-in type 'size' is already defined
tests/qapi-schema/redefined-builtin.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/redefined-command.err +4 -4
index 54e366bbf3..888eea87ca 100644
@@ -1,4 +1,4 @@
-tests/qapi-schema/redefined-command.json: In command 'foo':
-tests/qapi-schema/redefined-command.json:3: 'foo' is already defined
-tests/qapi-schema/redefined-command.json: In command 'foo':
-tests/qapi-schema/redefined-command.json:2: previous definition
+redefined-command.json: In command 'foo':
+redefined-command.json:3: 'foo' is already defined
+redefined-command.json: In command 'foo':
+redefined-command.json:2: previous definition
tests/qapi-schema/redefined-command.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/redefined-event.err +4 -4
index 606c6e4497..b1a6d99d2f 100644
@@ -1,4 +1,4 @@
-tests/qapi-schema/redefined-event.json: In event 'EVENT_A':
-tests/qapi-schema/redefined-event.json:3: 'EVENT_A' is already defined
-tests/qapi-schema/redefined-event.json: In event 'EVENT_A':
-tests/qapi-schema/redefined-event.json:2: previous definition
+redefined-event.json: In event 'EVENT_A':
+redefined-event.json:3: 'EVENT_A' is already defined
+redefined-event.json: In event 'EVENT_A':
+redefined-event.json:2: previous definition
tests/qapi-schema/redefined-event.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/redefined-type.err +4 -4
index 77786f98ae..b7103fc15f 100644
@@ -1,4 +1,4 @@
-tests/qapi-schema/redefined-type.json: In enum 'foo':
-tests/qapi-schema/redefined-type.json:3: 'foo' is already defined
-tests/qapi-schema/redefined-type.json: In struct 'foo':
-tests/qapi-schema/redefined-type.json:2: previous definition
+redefined-type.json: In enum 'foo':
+redefined-type.json:3: 'foo' is already defined
+redefined-type.json: In struct 'foo':
+redefined-type.json:2: previous definition
tests/qapi-schema/redefined-type.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/reserved-command-q.err +2 -2
index 7f65cda02d..6fecbaa046 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/reserved-command-q.json: In command 'q-unix':
-tests/qapi-schema/reserved-command-q.json:5: command has an invalid name
+reserved-command-q.json: In command 'q-unix':
+reserved-command-q.json:5: command has an invalid name
tests/qapi-schema/reserved-command-q.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/reserved-enum-q.err +2 -2
index e202f9ff7b..fc3c757874 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/reserved-enum-q.json: In enum 'Foo':
-tests/qapi-schema/reserved-enum-q.json:4: 'data' member 'q-Unix' has an invalid name
+reserved-enum-q.json: In enum 'Foo':
+reserved-enum-q.json:4: 'data' member 'q-Unix' has an invalid name
tests/qapi-schema/reserved-enum-q.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/reserved-member-has.err +2 -2
index c7ad721ad1..436e1749f2 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/reserved-member-has.json: In command 'oops':
-tests/qapi-schema/reserved-member-has.json:5: 'data' member 'has-a' uses reserved name
+reserved-member-has.json: In command 'oops':
+reserved-member-has.json:5: 'data' member 'has-a' uses reserved name
tests/qapi-schema/reserved-member-has.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/reserved-member-q.err +2 -2
index 04078604fa..9ac8654a8b 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/reserved-member-q.json: In struct 'Foo':
-tests/qapi-schema/reserved-member-q.json:4: 'data' member 'q-unix' has an invalid name
+reserved-member-q.json: In struct 'Foo':
+reserved-member-q.json:4: 'data' member 'q-unix' has an invalid name
tests/qapi-schema/reserved-member-q.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/reserved-member-u.err +2 -2
index 2e92c11ba5..231d552494 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/reserved-member-u.json: In struct 'Oops':
-tests/qapi-schema/reserved-member-u.json:7: 'data' member 'u' uses reserved name
+reserved-member-u.json: In struct 'Oops':
+reserved-member-u.json:7: 'data' member 'u' uses reserved name
tests/qapi-schema/reserved-member-u.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/reserved-member-underscore.err +2 -2
index da62b48222..df3ab8a11a 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/reserved-member-underscore.json: In struct 'Oops':
-tests/qapi-schema/reserved-member-underscore.json:4: 'data' member '_oops' has an invalid name
+reserved-member-underscore.json: In struct 'Oops':
+reserved-member-underscore.json:4: 'data' member '_oops' has an invalid name
tests/qapi-schema/reserved-member-underscore.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/reserved-type-kind.err +2 -2
index f8112cf92e..d8fb769f9d 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/reserved-type-kind.json: In enum 'UnionKind':
-tests/qapi-schema/reserved-type-kind.json:2: enum name should not end in 'Kind'
+reserved-type-kind.json: In enum 'UnionKind':
+reserved-type-kind.json:2: enum name should not end in 'Kind'
tests/qapi-schema/reserved-type-kind.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/reserved-type-list.err +2 -2
index c6eee0585c..e09f5352f8 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/reserved-type-list.json: In struct 'FooList':
-tests/qapi-schema/reserved-type-list.json:5: struct name should not end in 'List'
+reserved-type-list.json: In struct 'FooList':
+reserved-type-list.json:5: struct name should not end in 'List'
tests/qapi-schema/reserved-type-list.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/returns-alternate.err +2 -2
index c1caf98c47..b6421a8917 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/returns-alternate.json: In command 'oops':
-tests/qapi-schema/returns-alternate.json:3: command's 'returns' cannot take alternate type 'Alt'
+returns-alternate.json: In command 'oops':
+returns-alternate.json:3: command's 'returns' cannot take alternate type 'Alt'
tests/qapi-schema/returns-alternate.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/returns-array-bad.err +2 -2
index 1b86777d8f..52712d139d 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/returns-array-bad.json: In command 'oops':
-tests/qapi-schema/returns-array-bad.json:2: 'returns': array type must contain single type name
+returns-array-bad.json: In command 'oops':
+returns-array-bad.json:2: 'returns': array type must contain single type name
tests/qapi-schema/returns-array-bad.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/returns-dict.err +2 -2
index 52e4f3ad71..9b2d90c010 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/returns-dict.json: In command 'oops':
-tests/qapi-schema/returns-dict.json:2: 'returns' should be a type name
+returns-dict.json: In command 'oops':
+returns-dict.json:2: 'returns' should be a type name
tests/qapi-schema/returns-dict.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/returns-unknown.err +2 -2
index f0a989a175..bf59086d0c 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/returns-unknown.json: In command 'oops':
-tests/qapi-schema/returns-unknown.json:2: command's 'returns' uses unknown type 'NoSuchType'
+returns-unknown.json: In command 'oops':
+returns-unknown.json:2: command's 'returns' uses unknown type 'NoSuchType'
tests/qapi-schema/returns-unknown.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/returns-whitelist.err +2 -2
index 5b0285220f..c6e46b9b86 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/returns-whitelist.json: In command 'no-way-this-will-get-whitelisted':
-tests/qapi-schema/returns-whitelist.json:14: command's 'returns' cannot take array type ['int']
+returns-whitelist.json: In command 'no-way-this-will-get-whitelisted':
+returns-whitelist.json:14: command's 'returns' cannot take array type ['int']
tests/qapi-schema/returns-whitelist.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/string-code-point-127.err +1 -1
index b4fa2610a9..eb0d1c71a6 100644
@@ -1 +1 @@
-tests/qapi-schema/string-code-point-127.json:2:14: funny character in string
+string-code-point-127.json:2:14: funny character in string
tests/qapi-schema/string-code-point-127.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/string-code-point-31.err +1 -1
index 0bb5ce37b8..ae969d6e10 100644
@@ -1 +1 @@
-tests/qapi-schema/string-code-point-31.json:2:14: funny character in string
+string-code-point-31.json:2:14: funny character in string
tests/qapi-schema/string-code-point-31.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/struct-base-clash-deep.err +2 -2
index 2b12b3c07f..79879681d9 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/struct-base-clash-deep.json: In struct 'Sub':
-tests/qapi-schema/struct-base-clash-deep.json:10: member 'name' collides with member 'name' of type 'Base'
+struct-base-clash-deep.json: In struct 'Sub':
+struct-base-clash-deep.json:10: member 'name' collides with member 'name' of type 'Base'
tests/qapi-schema/struct-base-clash-deep.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/struct-base-clash.err +2 -2
index 8c3ee1c435..46473947e6 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/struct-base-clash.json: In struct 'Sub':
-tests/qapi-schema/struct-base-clash.json:5: member 'name' collides with member 'name' of type 'Base'
+struct-base-clash.json: In struct 'Sub':
+struct-base-clash.json:5: member 'name' collides with member 'name' of type 'Base'
tests/qapi-schema/struct-base-clash.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/struct-data-invalid.err +2 -2
index aa868bf974..5ed4bec573 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/struct-data-invalid.json: In struct 'foo':
-tests/qapi-schema/struct-data-invalid.json:1: 'data' should be an object or type name
+struct-data-invalid.json: In struct 'foo':
+struct-data-invalid.json:1: 'data' should be an object or type name
tests/qapi-schema/struct-data-invalid.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/struct-member-if-invalid.err +2 -2
index 4c5983674b..42e7fdae3c 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/struct-member-if-invalid.json: In struct 'Stru':
-tests/qapi-schema/struct-member-if-invalid.json:2: 'if' condition of 'data' member 'member' must be a string or a list of strings
+struct-member-if-invalid.json: In struct 'Stru':
+struct-member-if-invalid.json:2: 'if' condition of 'data' member 'member' must be a string or a list of strings
tests/qapi-schema/struct-member-if-invalid.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/struct-member-invalid-dict.err +2 -2
index 46ec991c28..0621aecfbd 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/struct-member-invalid-dict.json: In struct 'foo':
-tests/qapi-schema/struct-member-invalid-dict.json:2: 'data' member '*a' misses key 'type'
+struct-member-invalid-dict.json: In struct 'foo':
+struct-member-invalid-dict.json:2: 'data' member '*a' misses key 'type'
tests/qapi-schema/struct-member-invalid-dict.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/struct-member-invalid.err +2 -2
index 92d4973832..9a2c934538 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/struct-member-invalid.json: In struct 'foo':
-tests/qapi-schema/struct-member-invalid.json:1: 'data' member 'a' should be a type name
+struct-member-invalid.json: In struct 'foo':
+struct-member-invalid.json:1: 'data' member 'a' should be a type name
tests/qapi-schema/struct-member-invalid.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/test-qapi.py +104 -15

135 lines not on this page · raw message

tests/qapi-schema/trailing-comma-list.err +1 -1
index 167d688beb..ad2f2d7c97 100644
@@ -1 +1 @@
-tests/qapi-schema/trailing-comma-list.json:2:36: expected '{', '[', string, boolean or 'null'
+trailing-comma-list.json:2:36: expected '{', '[', string, boolean or 'null'
tests/qapi-schema/trailing-comma-list.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/trailing-comma-object.err +1 -1
index 186df0fa45..29aafc69cd 100644
@@ -1 +1 @@
-tests/qapi-schema/trailing-comma-object.json:2:38: expected string
+trailing-comma-object.json:2:38: expected string
tests/qapi-schema/trailing-comma-object.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/type-bypass-bad-gen.err +2 -2
index 1077651896..2ca95cd86d 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/type-bypass-bad-gen.json: In command 'foo':
-tests/qapi-schema/type-bypass-bad-gen.json:2: flag 'gen' may only use false value
+type-bypass-bad-gen.json: In command 'foo':
+type-bypass-bad-gen.json:2: flag 'gen' may only use false value
tests/qapi-schema/type-bypass-bad-gen.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/unclosed-list.err +1 -1
index 6648a8e30b..aa2c430b22 100644
@@ -1 +1 @@
-tests/qapi-schema/unclosed-list.json:1:20: expected ',' or ']'
+unclosed-list.json:1:20: expected ',' or ']'
tests/qapi-schema/unclosed-list.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/unclosed-object.err +1 -1
index 54d221e3a9..c08499b341 100644
@@ -1 +1 @@
-tests/qapi-schema/unclosed-object.json:1:21: expected ',' or '}'
+unclosed-object.json:1:21: expected ',' or '}'
tests/qapi-schema/unclosed-object.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/unclosed-string.err +1 -1
index 9439698fe0..175e192b24 100644
@@ -1 +1 @@
-tests/qapi-schema/unclosed-string.json:1:11: missing terminating "'"
+unclosed-string.json:1:11: missing terminating "'"
tests/qapi-schema/unclosed-string.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/union-base-empty.err +2 -2
index b76542d47a..3630b341a6 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/union-base-empty.json: In union 'TestUnion':
-tests/qapi-schema/union-base-empty.json:5: discriminator 'type' is not a member of 'base'
+union-base-empty.json: In union 'TestUnion':
+union-base-empty.json:5: discriminator 'type' is not a member of 'base'
tests/qapi-schema/union-base-empty.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/union-base-no-discriminator.err +2 -2
index f4c16a2c14..9cd5d11b0b 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/union-base-no-discriminator.json: In union 'TestUnion':
-tests/qapi-schema/union-base-no-discriminator.json:11: 'base' requires 'discriminator'
+union-base-no-discriminator.json: In union 'TestUnion':
+union-base-no-discriminator.json:11: 'base' requires 'discriminator'
tests/qapi-schema/union-base-no-discriminator.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/union-branch-case.err +2 -2
index a0684ae637..b1e9417303 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/union-branch-case.json: In union 'Uni':
-tests/qapi-schema/union-branch-case.json:2: 'data' member 'Branch' uses uppercase in name
+union-branch-case.json: In union 'Uni':
+union-branch-case.json:2: 'data' member 'Branch' uses uppercase in name
tests/qapi-schema/union-branch-case.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/union-branch-if-invalid.err +2 -2
index 14819bf8b8..dd4518233e 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/union-branch-if-invalid.json: In union 'Uni':
-tests/qapi-schema/union-branch-if-invalid.json:4: 'if' condition '' of 'data' member 'branch1' makes no sense
+union-branch-if-invalid.json: In union 'Uni':
+union-branch-if-invalid.json:4: 'if' condition '' of 'data' member 'branch1' makes no sense
tests/qapi-schema/union-branch-if-invalid.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/union-branch-invalid-dict.err +2 -2
index 2967cd6260..8137c5a767 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/union-branch-invalid-dict.json: In union 'UnionInvalidBranch':
-tests/qapi-schema/union-branch-invalid-dict.json:2: 'data' member 'integer' misses key 'type'
+union-branch-invalid-dict.json: In union 'UnionInvalidBranch':
+union-branch-invalid-dict.json:2: 'data' member 'integer' misses key 'type'
tests/qapi-schema/union-branch-invalid-dict.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/union-clash-branches.err +2 -2
index 931399f076..73bbc2cabd 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/union-clash-branches.json: In union 'TestUnion':
-tests/qapi-schema/union-clash-branches.json:4: branch 'a_b' collides with branch 'a-b'
+union-clash-branches.json: In union 'TestUnion':
+union-clash-branches.json:4: branch 'a_b' collides with branch 'a-b'
tests/qapi-schema/union-clash-branches.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/union-empty.err +2 -2
index 35c0d62eb0..59788c94ce 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/union-empty.json: In union 'Union':
-tests/qapi-schema/union-empty.json:2: union has no branches
+union-empty.json: In union 'Union':
+union-empty.json:2: union has no branches
tests/qapi-schema/union-empty.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/union-invalid-base.err +2 -2
index 10fecf0b56..a804028438 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/union-invalid-base.json: In union 'TestUnion':
-tests/qapi-schema/union-invalid-base.json:8: 'base' requires a struct type, built-in type 'int' isn't
+union-invalid-base.json: In union 'TestUnion':
+union-invalid-base.json:8: 'base' requires a struct type, built-in type 'int' isn't
tests/qapi-schema/union-invalid-base.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/union-optional-branch.err +2 -2
index 9f24274923..b33f111de4 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/union-optional-branch.json: In union 'Union':
-tests/qapi-schema/union-optional-branch.json:2: 'data' member '*a' has an invalid name
+union-optional-branch.json: In union 'Union':
+union-optional-branch.json:2: 'data' member '*a' has an invalid name
tests/qapi-schema/union-optional-branch.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/union-unknown.err +2 -2
index a7f340ddca..7aba9f94da 100644
@@ -1,2 +1,2 @@
-tests/qapi-schema/union-unknown.json: In union 'Union':
-tests/qapi-schema/union-unknown.json:2: union uses unknown type 'MissingType'
+union-unknown.json: In union 'Union':
+union-unknown.json:2: union uses unknown type 'MissingType'
tests/qapi-schema/union-unknown.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/unknown-escape.err +1 -1
index e24bbaf046..759a5990d8 100644
@@ -1 +1 @@
-tests/qapi-schema/unknown-escape.json:3:21: unknown escape \x
+unknown-escape.json:3:21: unknown escape \x
tests/qapi-schema/unknown-escape.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
tests/qapi-schema/unknown-expr-key.err +2 -2
index be9f99c4ef..c5f395bf79 100644
@@ -1,3 +1,3 @@
-tests/qapi-schema/unknown-expr-key.json: In struct 'bar':
-tests/qapi-schema/unknown-expr-key.json:2: struct has unknown keys 'bogus', 'phony'
+unknown-expr-key.json: In struct 'bar':
+unknown-expr-key.json:2: struct has unknown keys 'bogus', 'phony'
 Valid keys are 'base', 'data', 'features', 'if', 'struct'.
tests/qapi-schema/unknown-expr-key.exit deleted +0 -1
deleted file mode 100644
index d00491fd7e..0000000000
@@ -1 +0,0 @@
-1
Signature · 1 line
2.21.0
#5 lore raw

PATCH v2 5/7 qapi: Move gen_enum(), gen_enum_lookup() back to qapi/types.py

In reply to Markus Armbruster

The next commit will split up qapi/common.py. gen_enum() needs QAPISchemaEnumMember, and that's in the way. Move it to qapi/types.py along with its buddy gen_enum_lookup().

Permit me a short a digression on history: how did gen_enum() end up in qapi/common.py? Commit 21cd70dfc1 "qapi script: add event support" duplicated qapi-types.py's gen_enum() and gen_enum_lookup() in qapi-event.py. Simply importing them would have been cleaner, but wasn't possible as qapi-types.py was a program, not a module. Commit efd2eaa6c2 "qapi: De-duplicate enum code generation" de-duplicated by moving them to qapi.py, which was a module.

Since then, program qapi-types.py has morphed into module types.py. It's where gen_enum() and gen_enum_lookup() started, and where they belong.

---
 scripts/qapi/common.py | 59 ------------------------------------------
 scripts/qapi/events.py |  1 +
 scripts/qapi/types.py  | 59 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 59 deletions(-)
scripts/qapi/common.py +0 -59
index 9d5c05f6a1..306857f0c0 100644
@@ -2239,65 +2239,6 @@ def _wrap_ifcond(ifcond, before, after):
     return out
 
 
-def gen_enum_lookup(name, members, prefix=None):
-    ret = mcgen('''
-
-const QEnumLookup %(c_name)s_lookup = {
-    .array = (const char *const[]) {
-''',
-                c_name=c_name(name))
-    for m in members:
-        ret += gen_if(m.ifcond)
-        index = c_enum_const(name, m.name, prefix)
-        ret += mcgen('''
-        [%(index)s] = "%(name)s",
-''',
-                     index=index, name=m.name)
-        ret += gen_endif(m.ifcond)
-
-    ret += mcgen('''
-    },
-    .size = %(max_index)s
-};
-''',
-                 max_index=c_enum_const(name, '_MAX', prefix))
-    return ret
-
-
-def gen_enum(name, members, prefix=None):
-    # append automatically generated _MAX value
-    enum_members = members + [QAPISchemaEnumMember('_MAX', None)]
-
-    ret = mcgen('''
-
-typedef enum %(c_name)s {
-''',
-                c_name=c_name(name))
-
-    for m in enum_members:
-        ret += gen_if(m.ifcond)
-        ret += mcgen('''
-    %(c_enum)s,
-''',
-                     c_enum=c_enum_const(name, m.name, prefix))
-        ret += gen_endif(m.ifcond)
-
-    ret += mcgen('''
-} %(c_name)s;
-''',
-                 c_name=c_name(name))
-
-    ret += mcgen('''
-
-#define %(c_name)s_str(val) \\
-    qapi_enum_lookup(&%(c_name)s_lookup, (val))
-
-extern const QEnumLookup %(c_name)s_lookup;
-''',
-                 c_name=c_name(name))
-    return ret
-
-
 def build_params(arg_type, boxed, extra=None):
     ret = ''
     sep = ''
scripts/qapi/events.py +1 -0
index 7308e8e589..a716a1d27f 100644
@@ -13,6 +13,7 @@ See the COPYING file in the top-level directory.
 """
 
 from qapi.common import *
+from qapi.types import gen_enum, gen_enum_lookup
 
 
 def build_event_send_proto(name, arg_type, boxed):
scripts/qapi/types.py +59 -0

65 lines not on this page · raw message

Signature · 1 line
2.21.0
#6 lore raw

PATCH v2 6/7 qapi: Split up scripts/qapi/common.py

In reply to Markus Armbruster

The QAPI code generator clocks in at some 3100 SLOC in 8 source files. Almost 60% of the code is in qapi/common.py. Split it into more focused modules:

* Move QAPISchemaPragma and QAPISourceInfo to qapi/source.py.

* Move QAPIError and its sub-classes to qapi/error.py.

* Move QAPISchemaParser and QAPIDoc to parser.py. Use the opportunity to put QAPISchemaParser first.

* Move check_expr() & friends to qapi/expr.py. Use the opportunity to put the code into a more sensible order.

* Move QAPISchema & friends to qapi/schema.py

* Move QAPIGen and its sub-classes, ifcontext, QAPISchemaModularCVisitor, and QAPISchemaModularCVisitor to qapi/gen.py

* Delete camel_case(), it's unused since commit e98859a9b9 "qapi:
Clean up after recent conversions to QAPISchemaVisitor"

A number of helper functions remain in qapi/common.py. I considered moving the code generator helpers to qapi/gen.py, but decided not to. Perhaps we should rewrite them as methods of QAPIGen some day.

---
 Makefile                       |   13 +-
 scripts/qapi-gen.py            |   10 +-
 scripts/qapi/commands.py       |    1 +
 scripts/qapi/common.py         | 2321 --------------------------------
 scripts/qapi/doc.py            |    7 +-
 scripts/qapi/error.py          |   42 +
 scripts/qapi/events.py         |    2 +
 scripts/qapi/expr.py           |  377 ++++++
 scripts/qapi/gen.py            |  290 ++++
 scripts/qapi/introspect.py     |    5 +
 scripts/qapi/parser.py         |  569 ++++++++
 scripts/qapi/schema.py         | 1042 ++++++++++++++
 scripts/qapi/source.py         |   67 +
 scripts/qapi/types.py          |    2 +
 scripts/qapi/visit.py          |    2 +
 tests/Makefile.include         |   13 +-
 tests/qapi-schema/test-qapi.py |    6 +-
 17 files changed, 2434 insertions(+), 2335 deletions(-)
 create mode 100644 scripts/qapi/error.py
 create mode 100644 scripts/qapi/expr.py
 create mode 100644 scripts/qapi/gen.py
 create mode 100644 scripts/qapi/parser.py
 create mode 100644 scripts/qapi/schema.py
 create mode 100644 scripts/qapi/source.py
Makefile +10 -3
index d20e7ffce3..0e994a275d 100644
@@ -582,13 +582,20 @@ qemu-ga$(EXESUF): QEMU_CFLAGS += -I qga/qapi-generated
 qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS)
 qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS)
 
-qapi-py = $(SRC_PATH)/scripts/qapi/commands.py \
+qapi-py = $(SRC_PATH)/scripts/qapi/__init__.py \
+$(SRC_PATH)/scripts/qapi/commands.py \
+$(SRC_PATH)/scripts/qapi/common.py \
+$(SRC_PATH)/scripts/qapi/doc.py \
+$(SRC_PATH)/scripts/qapi/error.py \
 $(SRC_PATH)/scripts/qapi/events.py \
+$(SRC_PATH)/scripts/qapi/expr.py \
+$(SRC_PATH)/scripts/qapi/gen.py \
 $(SRC_PATH)/scripts/qapi/introspect.py \
+$(SRC_PATH)/scripts/qapi/parser.py \
+$(SRC_PATH)/scripts/qapi/schema.py \
+$(SRC_PATH)/scripts/qapi/source.py \
 $(SRC_PATH)/scripts/qapi/types.py \
 $(SRC_PATH)/scripts/qapi/visit.py \
-$(SRC_PATH)/scripts/qapi/common.py \
-$(SRC_PATH)/scripts/qapi/doc.py \
 $(SRC_PATH)/scripts/qapi-gen.py
 
 qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h \
scripts/qapi-gen.py +6 -4
index 3d98ca2e0c..f93f3c7c23 100755
@@ -5,16 +5,18 @@
 # See the COPYING file in the top-level directory.
 
 from __future__ import print_function
+
 import argparse
 import re
 import sys
-from qapi.common import QAPIError, QAPISchema
-from qapi.types import gen_types
-from qapi.visit import gen_visit
+
 from qapi.commands import gen_commands
+from qapi.doc import gen_doc
 from qapi.events import gen_events
 from qapi.introspect import gen_introspect
-from qapi.doc import gen_doc
+from qapi.schema import QAPIError, QAPISchema
+from qapi.types import gen_types
+from qapi.visit import gen_visit
 
 
 def main(argv):
scripts/qapi/commands.py +1 -0
index 7e3dd1068a..898516b086 100644
@@ -14,6 +14,7 @@ See the COPYING file in the top-level directory.
 """
 
 from qapi.common import *
+from qapi.gen import QAPIGenCCode, QAPISchemaModularCVisitor, ifcontext
 
 
 def gen_command_decl(name, arg_type, boxed, ret_type):
scripts/qapi/common.py +0 -2321

2,338 lines not on this page · raw message

scripts/qapi/doc.py +4 -3
index 693cc4486b..1c5125249f 100755
@@ -7,7 +7,8 @@
 
 from __future__ import print_function
 import re
-import qapi.common
+from qapi.gen import QAPIGenDoc, QAPISchemaVisitor
+
 
 MSG_FMT = """
 @deftypefn {type} {{}} {name}
@@ -216,10 +217,10 @@ def texi_entity(doc, what, ifcond, base=None, variants=None,
             + texi_sections(doc, ifcond))
 
 
-class QAPISchemaGenDocVisitor(qapi.common.QAPISchemaVisitor):
+class QAPISchemaGenDocVisitor(QAPISchemaVisitor):
     def __init__(self, prefix):
         self._prefix = prefix
-        self._gen = qapi.common.QAPIGenDoc(self._prefix + 'qapi-doc.texi')
+        self._gen = QAPIGenDoc(self._prefix + 'qapi-doc.texi')
         self.cur_doc = None
 
     def write(self, output_dir):
scripts/qapi/error.py new file +42 -0

42 lines not on this page · raw message

scripts/qapi/events.py +2 -0
index a716a1d27f..10fc509fa9 100644
@@ -13,6 +13,8 @@ See the COPYING file in the top-level directory.
 """
 
 from qapi.common import *
+from qapi.gen import QAPISchemaModularCVisitor, ifcontext
+from qapi.schema import QAPISchemaEnumMember
 from qapi.types import gen_enum, gen_enum_lookup
 
 
scripts/qapi/expr.py new file +377 -0

377 lines not on this page · raw message

scripts/qapi/gen.py new file +290 -0

162 lines not on this page · raw message

scripts/qapi/introspect.py +5 -0
index f62cf0a2e1..4f257591de 100644

Lines of this file are not shown. View the raw message.

scripts/qapi/parser.py new file +569 -0

569 lines not on this page · raw message

scripts/qapi/schema.py new file +1042 -0

1,042 lines not on this page · raw message

scripts/qapi/source.py new file +67 -0

67 lines not on this page · raw message

scripts/qapi/types.py +2 -0
index 711543147d..d8751daa04 100644

Lines of this file are not shown. View the raw message.

scripts/qapi/visit.py +2 -0
index 484ebb66ad..c72f2bc5c0 100644

Lines of this file are not shown. View the raw message.

tests/Makefile.include +10 -3
index 1b24b8ba10..09e5b410dc 100644

Lines of this file are not shown. View the raw message.

tests/qapi-schema/test-qapi.py +5 -1
index 42baa702b6..664254618a 100755

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.21.0

Part of the diff is not shown here. View the raw message.

#7 lore raw

PATCH v2 7/7 qapi: Clear scripts/qapi/doc.py executable bits again

In reply to Markus Armbruster

Commit fbf09a2fa4 "qapi: add 'ifcond' to visitor methods" brought back the executable bits. Fix that. Drop the #! line for good measure.

---
 scripts/qapi/doc.py | 1 -
 1 file changed, 1 deletion(-)
 mode change 100755 => 100644 scripts/qapi/doc.py
scripts/qapi/doc.py +0 -1
old mode 100755
new mode 100644
index 1c5125249f..dc8919bab7
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # QAPI texi generator
 #
 # This work is licensed under the terms of the GNU LGPL, version 2+.
Signature · 1 line
2.21.0