[PATCH 00/25] qapi: Pay back some frontend technical debt

Markus Armbruster posted 25 patches 4 years, 6 months ago
Test docker-clang@ubuntu passed
Test checkpatch passed
Test docker-mingw@fedora passed
Test docker-quick@centos7 passed
Test FreeBSD passed
Test asan passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190924132830.15835-1-armbru@redhat.com
Maintainers: Eric Blake <eblake@redhat.com>, Michael Roth <mdroth@linux.vnet.ibm.com>, Markus Armbruster <armbru@redhat.com>
There is a newer version of this series
qapi/qapi-schema.json                         |    2 +-
scripts/qapi/common.py                        | 1017 +++++++++--------
scripts/qapi/events.py                        |    2 +-
tests/qapi-schema/allow-preconfig-test.err    |    3 +-
tests/qapi-schema/alternate-any.err           |    3 +-
tests/qapi-schema/alternate-array.err         |    3 +-
tests/qapi-schema/alternate-base.err          |    3 +-
.../alternate-branch-if-invalid.err           |    1 +
tests/qapi-schema/alternate-clash.err         |    3 +-
.../alternate-conflict-bool-string.err        |    3 +-
tests/qapi-schema/alternate-conflict-dict.err |    3 +-
.../alternate-conflict-enum-bool.err          |    3 +-
.../alternate-conflict-enum-int.err           |    3 +-
.../alternate-conflict-num-string.err         |    3 +-
.../qapi-schema/alternate-conflict-string.err |    3 +-
tests/qapi-schema/alternate-empty.err         |    3 +-
tests/qapi-schema/alternate-invalid-dict.err  |    3 +-
tests/qapi-schema/alternate-nested.err        |    3 +-
tests/qapi-schema/alternate-unknown.err       |    3 +-
tests/qapi-schema/args-alternate.err          |    3 +-
tests/qapi-schema/args-any.err                |    3 +-
tests/qapi-schema/args-array-empty.err        |    3 +-
tests/qapi-schema/args-array-unknown.err      |    3 +-
tests/qapi-schema/args-bad-boxed.err          |    3 +-
tests/qapi-schema/args-boxed-anon.err         |    3 +-
tests/qapi-schema/args-boxed-string.err       |    3 +-
tests/qapi-schema/args-int.err                |    3 +-
tests/qapi-schema/args-invalid.err            |    3 +-
tests/qapi-schema/args-member-array-bad.err   |    3 +-
tests/qapi-schema/args-member-case.err        |    3 +-
tests/qapi-schema/args-member-case.json       |    2 +-
tests/qapi-schema/args-member-unknown.err     |    3 +-
tests/qapi-schema/args-name-clash.err         |    3 +-
tests/qapi-schema/args-union.err              |    3 +-
tests/qapi-schema/args-unknown.err            |    3 +-
tests/qapi-schema/bad-base.err                |    3 +-
tests/qapi-schema/bad-data.err                |    3 +-
tests/qapi-schema/bad-ident.err               |    3 +-
tests/qapi-schema/bad-if-empty-list.err       |    1 +
tests/qapi-schema/bad-if-empty.err            |    1 +
tests/qapi-schema/bad-if-list.err             |    1 +
tests/qapi-schema/bad-if.err                  |    1 +
tests/qapi-schema/bad-type-bool.err           |    2 +-
tests/qapi-schema/bad-type-dict.err           |    2 +-
tests/qapi-schema/bad-type-int.err            |    2 +-
tests/qapi-schema/base-cycle-direct.err       |    3 +-
tests/qapi-schema/base-cycle-indirect.err     |    3 +-
tests/qapi-schema/command-int.err             |    3 +-
.../qapi-schema/doc-bad-alternate-member.err  |    2 +-
tests/qapi-schema/doc-bad-command-arg.err     |    2 +-
tests/qapi-schema/doc-bad-symbol.err          |    3 +-
tests/qapi-schema/doc-bad-union-member.err    |    2 +-
tests/qapi-schema/doc-before-include.err      |    2 +-
tests/qapi-schema/doc-before-pragma.err       |    2 +-
tests/qapi-schema/doc-duplicated-return.err   |    2 +-
tests/qapi-schema/doc-duplicated-since.err    |    2 +-
tests/qapi-schema/doc-empty-arg.err           |    2 +-
tests/qapi-schema/doc-empty-section.err       |    2 +-
tests/qapi-schema/doc-empty-symbol.err        |    2 +-
tests/qapi-schema/doc-invalid-end.err         |    2 +-
tests/qapi-schema/doc-invalid-end2.err        |    2 +-
tests/qapi-schema/doc-invalid-start.err       |    2 +-
tests/qapi-schema/doc-missing-colon.err       |    2 +-
tests/qapi-schema/doc-missing-expr.err        |    2 +-
tests/qapi-schema/doc-missing-space.err       |    2 +-
tests/qapi-schema/doc-missing.err             |    3 +-
tests/qapi-schema/doc-no-symbol.err           |    2 +-
tests/qapi-schema/double-type.err             |    3 +-
tests/qapi-schema/duplicate-key.err           |    2 +-
tests/qapi-schema/enum-bad-member.err         |    3 +-
tests/qapi-schema/enum-bad-name.err           |    3 +-
tests/qapi-schema/enum-bad-prefix.err         |    3 +-
tests/qapi-schema/enum-clash-member.err       |    3 +-
.../qapi-schema/enum-dict-member-unknown.err  |    3 +-
tests/qapi-schema/enum-if-invalid.err         |    1 +
tests/qapi-schema/enum-int-member.err         |    2 +-
tests/qapi-schema/enum-member-case.err        |    3 +-
tests/qapi-schema/enum-missing-data.err       |    3 +-
tests/qapi-schema/enum-wrong-data.err         |    3 +-
tests/qapi-schema/escape-outside-string.err   |    2 +-
tests/qapi-schema/escape-too-big.err          |    1 +
tests/qapi-schema/event-boxed-empty.err       |    3 +-
.../qapi-schema/event-member-invalid-dict.err |    3 +-
tests/qapi-schema/event-nest-struct.err       |    3 +-
tests/qapi-schema/features-bad-type.err       |    3 +-
tests/qapi-schema/features-duplicate-name.err |    3 +-
tests/qapi-schema/features-if-invalid.err     |    1 +
tests/qapi-schema/features-missing-name.err   |    3 +-
tests/qapi-schema/features-name-bad-type.err  |    3 +-
tests/qapi-schema/features-no-list.err        |    3 +-
tests/qapi-schema/features-unknown-key.err    |    3 +-
tests/qapi-schema/flat-union-array-branch.err |    3 +-
tests/qapi-schema/flat-union-bad-base.err     |    3 +-
.../flat-union-bad-discriminator.err          |    3 +-
tests/qapi-schema/flat-union-base-any.err     |    3 +-
tests/qapi-schema/flat-union-base-union.err   |    3 +-
tests/qapi-schema/flat-union-clash-member.err |    3 +-
.../flat-union-discriminator-bad-name.err     |    3 +-
.../flat-union-discriminator-bad-name.json    |    1 -
tests/qapi-schema/flat-union-empty.err        |    3 +-
.../flat-union-inline-invalid-dict.err        |    3 +-
tests/qapi-schema/flat-union-inline.err       |    3 +-
tests/qapi-schema/flat-union-int-branch.err   |    3 +-
.../flat-union-invalid-branch-key.err         |    3 +-
.../flat-union-invalid-discriminator.err      |    3 +-
.../flat-union-invalid-if-discriminator.err   |    3 +-
tests/qapi-schema/flat-union-no-base.err      |    3 +-
.../flat-union-optional-discriminator.err     |    3 +-
.../flat-union-optional-discriminator.json    |    1 -
.../flat-union-string-discriminator.err       |    3 +-
tests/qapi-schema/funny-char.err              |    2 +-
tests/qapi-schema/funny-word.err              |    2 +-
tests/qapi-schema/ident-with-escape.err       |    2 +-
tests/qapi-schema/include-before-err.err      |    2 +-
tests/qapi-schema/include-cycle.err           |    2 +-
tests/qapi-schema/include-extra-junk.err      |    2 +-
tests/qapi-schema/include-nested-err.err      |    2 +-
tests/qapi-schema/include-no-file.err         |    2 +-
tests/qapi-schema/include-non-file.err        |    2 +-
tests/qapi-schema/include-self-cycle.err      |    2 +-
tests/qapi-schema/leading-comma-list.err      |    2 +-
tests/qapi-schema/leading-comma-object.err    |    2 +-
tests/qapi-schema/missing-colon.err           |    2 +-
tests/qapi-schema/missing-comma-list.err      |    2 +-
tests/qapi-schema/missing-comma-object.err    |    2 +-
tests/qapi-schema/missing-type.err            |    2 +-
.../nested-struct-data-invalid-dict.err       |    3 +-
tests/qapi-schema/nested-struct-data.err      |    3 +-
tests/qapi-schema/non-objects.err             |    2 +-
tests/qapi-schema/oob-test.err                |    3 +-
.../qapi-schema/pragma-doc-required-crap.err  |    2 +-
tests/qapi-schema/pragma-extra-junk.err       |    2 +-
.../pragma-name-case-whitelist-crap.err       |    2 +-
tests/qapi-schema/pragma-non-dict.err         |    2 +-
.../pragma-returns-whitelist-crap.err         |    2 +-
tests/qapi-schema/pragma-unknown.err          |    2 +-
tests/qapi-schema/quoted-structural-chars.err |    2 +-
tests/qapi-schema/redefined-builtin.err       |    3 +-
tests/qapi-schema/redefined-command.err       |    5 +-
tests/qapi-schema/redefined-event.err         |    5 +-
tests/qapi-schema/redefined-type.err          |    5 +-
tests/qapi-schema/reserved-command-q.err      |    3 +-
tests/qapi-schema/reserved-enum-q.err         |    3 +-
tests/qapi-schema/reserved-member-has.err     |    3 +-
tests/qapi-schema/reserved-member-q.err       |    3 +-
tests/qapi-schema/reserved-member-u.err       |    3 +-
.../reserved-member-underscore.err            |    3 +-
tests/qapi-schema/reserved-type-kind.err      |    3 +-
tests/qapi-schema/reserved-type-list.err      |    3 +-
tests/qapi-schema/returns-alternate.err       |    3 +-
tests/qapi-schema/returns-array-bad.err       |    3 +-
tests/qapi-schema/returns-dict.err            |    3 +-
tests/qapi-schema/returns-unknown.err         |    3 +-
tests/qapi-schema/returns-whitelist.err       |    3 +-
tests/qapi-schema/string-code-point-127.err   |    2 +-
tests/qapi-schema/string-code-point-31.err    |    2 +-
tests/qapi-schema/string-control.err          |    1 +
tests/qapi-schema/string-unclosed.err         |    1 +
tests/qapi-schema/string-unicode.err          |    1 +
tests/qapi-schema/struct-base-clash-deep.err  |    3 +-
tests/qapi-schema/struct-base-clash.err       |    3 +-
tests/qapi-schema/struct-data-invalid.err     |    3 +-
.../qapi-schema/struct-member-if-invalid.err  |    1 +
.../struct-member-invalid-dict.err            |    3 +-
tests/qapi-schema/struct-member-invalid.err   |    3 +-
tests/qapi-schema/trailing-comma-list.err     |    2 +-
tests/qapi-schema/trailing-comma-object.err   |    2 +-
tests/qapi-schema/type-bypass-bad-gen.err     |    3 +-
tests/qapi-schema/unclosed-list.err           |    2 +-
tests/qapi-schema/unclosed-object.err         |    2 +-
tests/qapi-schema/unclosed-string.err         |    2 +-
tests/qapi-schema/union-base-empty.err        |    3 +-
.../union-base-no-discriminator.err           |    3 +-
tests/qapi-schema/union-branch-case.err       |    3 +-
tests/qapi-schema/union-branch-case.json      |    4 +-
tests/qapi-schema/union-branch-if-invalid.err |    1 +
.../qapi-schema/union-branch-invalid-dict.err |    3 +-
tests/qapi-schema/union-clash-branches.err    |    3 +-
tests/qapi-schema/union-empty.err             |    3 +-
tests/qapi-schema/union-invalid-base.err      |    3 +-
tests/qapi-schema/union-optional-branch.err   |    3 +-
tests/qapi-schema/union-unknown.err           |    3 +-
tests/qapi-schema/union-unknown.json          |    2 +-
tests/qapi-schema/unknown-escape.err          |    2 +-
tests/qapi-schema/unknown-expr-key.err        |    3 +-
185 files changed, 814 insertions(+), 673 deletions(-)
create mode 100644 tests/qapi-schema/escape-too-big.err
create mode 100644 tests/qapi-schema/string-control.err
create mode 100644 tests/qapi-schema/string-unclosed.err
create mode 100644 tests/qapi-schema/string-unicode.err
[PATCH 00/25] qapi: Pay back some frontend technical debt
Posted by Markus Armbruster 4 years, 6 months ago
When we introduced the QAPISchema intermediate representation (commit
ac88219a6c7), we took a shortcut: we left check_exprs() & friends
alone instead of moving the semantic checks to their proper place.
Time to finish this job.  Topped off with error message gardening.

Based-on: <20190924123334.30645-1-armbru@redhat.com>

Markus Armbruster (25):
  qapi: Tighten QAPISchemaFOO.check() assertions
  qapi: Rename .owner to .defined_in
  qapi: New QAPISourceInfo, replacing dict
  qapi: Prefix frontend errors with an "in definition" line
  qapi: Clean up member name case checking
  qapi: Change frontend error messages to start with lower case
  qapi: Improve reporting of member name clashes
  qapi: Reorder check_FOO() parameters for consistency
  qapi: Improve reporting of invalid name errors
  qapi: Use check_name_str() where it suffices
  qapi: Report invalid '*' prefix like any other invalid name
  qapi: Move check for reserved names out of add_name()
  qapi: Make check_type()'s array case a bit more obvious
  qapi: Plumb info to the QAPISchemaMember
  qapi: Inline check_name() into check_union()
  qapi: Move context-sensitive checking to the proper place
  qapi: Move context-free checking to the proper place
  qapi: Improve reporting of invalid 'if' errors
  qapi: Improve reporting of invalid flags
  qapi: Improve reporting of missing / unknown definition keys
  qapi: Avoid redundant definition references in error messages
  qapi: Eliminate check_keys(), rename check_known_keys()
  qapi: Improve reporting of missing documentation comment
  qapi: Improve reporting of redefinition
  qapi: Improve source file read error handling

 qapi/qapi-schema.json                         |    2 +-
 scripts/qapi/common.py                        | 1017 +++++++++--------
 scripts/qapi/events.py                        |    2 +-
 tests/qapi-schema/allow-preconfig-test.err    |    3 +-
 tests/qapi-schema/alternate-any.err           |    3 +-
 tests/qapi-schema/alternate-array.err         |    3 +-
 tests/qapi-schema/alternate-base.err          |    3 +-
 .../alternate-branch-if-invalid.err           |    1 +
 tests/qapi-schema/alternate-clash.err         |    3 +-
 .../alternate-conflict-bool-string.err        |    3 +-
 tests/qapi-schema/alternate-conflict-dict.err |    3 +-
 .../alternate-conflict-enum-bool.err          |    3 +-
 .../alternate-conflict-enum-int.err           |    3 +-
 .../alternate-conflict-num-string.err         |    3 +-
 .../qapi-schema/alternate-conflict-string.err |    3 +-
 tests/qapi-schema/alternate-empty.err         |    3 +-
 tests/qapi-schema/alternate-invalid-dict.err  |    3 +-
 tests/qapi-schema/alternate-nested.err        |    3 +-
 tests/qapi-schema/alternate-unknown.err       |    3 +-
 tests/qapi-schema/args-alternate.err          |    3 +-
 tests/qapi-schema/args-any.err                |    3 +-
 tests/qapi-schema/args-array-empty.err        |    3 +-
 tests/qapi-schema/args-array-unknown.err      |    3 +-
 tests/qapi-schema/args-bad-boxed.err          |    3 +-
 tests/qapi-schema/args-boxed-anon.err         |    3 +-
 tests/qapi-schema/args-boxed-string.err       |    3 +-
 tests/qapi-schema/args-int.err                |    3 +-
 tests/qapi-schema/args-invalid.err            |    3 +-
 tests/qapi-schema/args-member-array-bad.err   |    3 +-
 tests/qapi-schema/args-member-case.err        |    3 +-
 tests/qapi-schema/args-member-case.json       |    2 +-
 tests/qapi-schema/args-member-unknown.err     |    3 +-
 tests/qapi-schema/args-name-clash.err         |    3 +-
 tests/qapi-schema/args-union.err              |    3 +-
 tests/qapi-schema/args-unknown.err            |    3 +-
 tests/qapi-schema/bad-base.err                |    3 +-
 tests/qapi-schema/bad-data.err                |    3 +-
 tests/qapi-schema/bad-ident.err               |    3 +-
 tests/qapi-schema/bad-if-empty-list.err       |    1 +
 tests/qapi-schema/bad-if-empty.err            |    1 +
 tests/qapi-schema/bad-if-list.err             |    1 +
 tests/qapi-schema/bad-if.err                  |    1 +
 tests/qapi-schema/bad-type-bool.err           |    2 +-
 tests/qapi-schema/bad-type-dict.err           |    2 +-
 tests/qapi-schema/bad-type-int.err            |    2 +-
 tests/qapi-schema/base-cycle-direct.err       |    3 +-
 tests/qapi-schema/base-cycle-indirect.err     |    3 +-
 tests/qapi-schema/command-int.err             |    3 +-
 .../qapi-schema/doc-bad-alternate-member.err  |    2 +-
 tests/qapi-schema/doc-bad-command-arg.err     |    2 +-
 tests/qapi-schema/doc-bad-symbol.err          |    3 +-
 tests/qapi-schema/doc-bad-union-member.err    |    2 +-
 tests/qapi-schema/doc-before-include.err      |    2 +-
 tests/qapi-schema/doc-before-pragma.err       |    2 +-
 tests/qapi-schema/doc-duplicated-return.err   |    2 +-
 tests/qapi-schema/doc-duplicated-since.err    |    2 +-
 tests/qapi-schema/doc-empty-arg.err           |    2 +-
 tests/qapi-schema/doc-empty-section.err       |    2 +-
 tests/qapi-schema/doc-empty-symbol.err        |    2 +-
 tests/qapi-schema/doc-invalid-end.err         |    2 +-
 tests/qapi-schema/doc-invalid-end2.err        |    2 +-
 tests/qapi-schema/doc-invalid-start.err       |    2 +-
 tests/qapi-schema/doc-missing-colon.err       |    2 +-
 tests/qapi-schema/doc-missing-expr.err        |    2 +-
 tests/qapi-schema/doc-missing-space.err       |    2 +-
 tests/qapi-schema/doc-missing.err             |    3 +-
 tests/qapi-schema/doc-no-symbol.err           |    2 +-
 tests/qapi-schema/double-type.err             |    3 +-
 tests/qapi-schema/duplicate-key.err           |    2 +-
 tests/qapi-schema/enum-bad-member.err         |    3 +-
 tests/qapi-schema/enum-bad-name.err           |    3 +-
 tests/qapi-schema/enum-bad-prefix.err         |    3 +-
 tests/qapi-schema/enum-clash-member.err       |    3 +-
 .../qapi-schema/enum-dict-member-unknown.err  |    3 +-
 tests/qapi-schema/enum-if-invalid.err         |    1 +
 tests/qapi-schema/enum-int-member.err         |    2 +-
 tests/qapi-schema/enum-member-case.err        |    3 +-
 tests/qapi-schema/enum-missing-data.err       |    3 +-
 tests/qapi-schema/enum-wrong-data.err         |    3 +-
 tests/qapi-schema/escape-outside-string.err   |    2 +-
 tests/qapi-schema/escape-too-big.err          |    1 +
 tests/qapi-schema/event-boxed-empty.err       |    3 +-
 .../qapi-schema/event-member-invalid-dict.err |    3 +-
 tests/qapi-schema/event-nest-struct.err       |    3 +-
 tests/qapi-schema/features-bad-type.err       |    3 +-
 tests/qapi-schema/features-duplicate-name.err |    3 +-
 tests/qapi-schema/features-if-invalid.err     |    1 +
 tests/qapi-schema/features-missing-name.err   |    3 +-
 tests/qapi-schema/features-name-bad-type.err  |    3 +-
 tests/qapi-schema/features-no-list.err        |    3 +-
 tests/qapi-schema/features-unknown-key.err    |    3 +-
 tests/qapi-schema/flat-union-array-branch.err |    3 +-
 tests/qapi-schema/flat-union-bad-base.err     |    3 +-
 .../flat-union-bad-discriminator.err          |    3 +-
 tests/qapi-schema/flat-union-base-any.err     |    3 +-
 tests/qapi-schema/flat-union-base-union.err   |    3 +-
 tests/qapi-schema/flat-union-clash-member.err |    3 +-
 .../flat-union-discriminator-bad-name.err     |    3 +-
 .../flat-union-discriminator-bad-name.json    |    1 -
 tests/qapi-schema/flat-union-empty.err        |    3 +-
 .../flat-union-inline-invalid-dict.err        |    3 +-
 tests/qapi-schema/flat-union-inline.err       |    3 +-
 tests/qapi-schema/flat-union-int-branch.err   |    3 +-
 .../flat-union-invalid-branch-key.err         |    3 +-
 .../flat-union-invalid-discriminator.err      |    3 +-
 .../flat-union-invalid-if-discriminator.err   |    3 +-
 tests/qapi-schema/flat-union-no-base.err      |    3 +-
 .../flat-union-optional-discriminator.err     |    3 +-
 .../flat-union-optional-discriminator.json    |    1 -
 .../flat-union-string-discriminator.err       |    3 +-
 tests/qapi-schema/funny-char.err              |    2 +-
 tests/qapi-schema/funny-word.err              |    2 +-
 tests/qapi-schema/ident-with-escape.err       |    2 +-
 tests/qapi-schema/include-before-err.err      |    2 +-
 tests/qapi-schema/include-cycle.err           |    2 +-
 tests/qapi-schema/include-extra-junk.err      |    2 +-
 tests/qapi-schema/include-nested-err.err      |    2 +-
 tests/qapi-schema/include-no-file.err         |    2 +-
 tests/qapi-schema/include-non-file.err        |    2 +-
 tests/qapi-schema/include-self-cycle.err      |    2 +-
 tests/qapi-schema/leading-comma-list.err      |    2 +-
 tests/qapi-schema/leading-comma-object.err    |    2 +-
 tests/qapi-schema/missing-colon.err           |    2 +-
 tests/qapi-schema/missing-comma-list.err      |    2 +-
 tests/qapi-schema/missing-comma-object.err    |    2 +-
 tests/qapi-schema/missing-type.err            |    2 +-
 .../nested-struct-data-invalid-dict.err       |    3 +-
 tests/qapi-schema/nested-struct-data.err      |    3 +-
 tests/qapi-schema/non-objects.err             |    2 +-
 tests/qapi-schema/oob-test.err                |    3 +-
 .../qapi-schema/pragma-doc-required-crap.err  |    2 +-
 tests/qapi-schema/pragma-extra-junk.err       |    2 +-
 .../pragma-name-case-whitelist-crap.err       |    2 +-
 tests/qapi-schema/pragma-non-dict.err         |    2 +-
 .../pragma-returns-whitelist-crap.err         |    2 +-
 tests/qapi-schema/pragma-unknown.err          |    2 +-
 tests/qapi-schema/quoted-structural-chars.err |    2 +-
 tests/qapi-schema/redefined-builtin.err       |    3 +-
 tests/qapi-schema/redefined-command.err       |    5 +-
 tests/qapi-schema/redefined-event.err         |    5 +-
 tests/qapi-schema/redefined-type.err          |    5 +-
 tests/qapi-schema/reserved-command-q.err      |    3 +-
 tests/qapi-schema/reserved-enum-q.err         |    3 +-
 tests/qapi-schema/reserved-member-has.err     |    3 +-
 tests/qapi-schema/reserved-member-q.err       |    3 +-
 tests/qapi-schema/reserved-member-u.err       |    3 +-
 .../reserved-member-underscore.err            |    3 +-
 tests/qapi-schema/reserved-type-kind.err      |    3 +-
 tests/qapi-schema/reserved-type-list.err      |    3 +-
 tests/qapi-schema/returns-alternate.err       |    3 +-
 tests/qapi-schema/returns-array-bad.err       |    3 +-
 tests/qapi-schema/returns-dict.err            |    3 +-
 tests/qapi-schema/returns-unknown.err         |    3 +-
 tests/qapi-schema/returns-whitelist.err       |    3 +-
 tests/qapi-schema/string-code-point-127.err   |    2 +-
 tests/qapi-schema/string-code-point-31.err    |    2 +-
 tests/qapi-schema/string-control.err          |    1 +
 tests/qapi-schema/string-unclosed.err         |    1 +
 tests/qapi-schema/string-unicode.err          |    1 +
 tests/qapi-schema/struct-base-clash-deep.err  |    3 +-
 tests/qapi-schema/struct-base-clash.err       |    3 +-
 tests/qapi-schema/struct-data-invalid.err     |    3 +-
 .../qapi-schema/struct-member-if-invalid.err  |    1 +
 .../struct-member-invalid-dict.err            |    3 +-
 tests/qapi-schema/struct-member-invalid.err   |    3 +-
 tests/qapi-schema/trailing-comma-list.err     |    2 +-
 tests/qapi-schema/trailing-comma-object.err   |    2 +-
 tests/qapi-schema/type-bypass-bad-gen.err     |    3 +-
 tests/qapi-schema/unclosed-list.err           |    2 +-
 tests/qapi-schema/unclosed-object.err         |    2 +-
 tests/qapi-schema/unclosed-string.err         |    2 +-
 tests/qapi-schema/union-base-empty.err        |    3 +-
 .../union-base-no-discriminator.err           |    3 +-
 tests/qapi-schema/union-branch-case.err       |    3 +-
 tests/qapi-schema/union-branch-case.json      |    4 +-
 tests/qapi-schema/union-branch-if-invalid.err |    1 +
 .../qapi-schema/union-branch-invalid-dict.err |    3 +-
 tests/qapi-schema/union-clash-branches.err    |    3 +-
 tests/qapi-schema/union-empty.err             |    3 +-
 tests/qapi-schema/union-invalid-base.err      |    3 +-
 tests/qapi-schema/union-optional-branch.err   |    3 +-
 tests/qapi-schema/union-unknown.err           |    3 +-
 tests/qapi-schema/union-unknown.json          |    2 +-
 tests/qapi-schema/unknown-escape.err          |    2 +-
 tests/qapi-schema/unknown-expr-key.err        |    3 +-
 185 files changed, 814 insertions(+), 673 deletions(-)
 create mode 100644 tests/qapi-schema/escape-too-big.err
 create mode 100644 tests/qapi-schema/string-control.err
 create mode 100644 tests/qapi-schema/string-unclosed.err
 create mode 100644 tests/qapi-schema/string-unicode.err

-- 
2.21.0