[PULL 00/37] QAPI patches for 2019-09-24

Markus Armbruster posted 37 patches 4 years, 7 months ago
Test asan passed
Test checkpatch failed
Test docker-quick@centos7 passed
Test docker-mingw@fedora passed
Test docker-clang@ubuntu passed
Test FreeBSD passed
Failed in applying to current master (apply log)
docs/devel/qapi-code-gen.txt                       | 1075 +++++++++++---------
include/qapi/visitor.h                             |    8 +-
qapi/opts-visitor.c                                |   26 +-
tests/test-qmp-cmds.c                              |    4 +
scripts/git.orderfile                              |    4 +-
scripts/qapi/commands.py                           |    4 +-
scripts/qapi/common.py                             |  380 ++++---
scripts/qapi/events.py                             |   12 +-
tests/Makefile.include                             |   16 +-
tests/qapi-schema/alternate-branch-if-invalid.err  |    1 +
...empty.exit => alternate-branch-if-invalid.exit} |    0
tests/qapi-schema/alternate-branch-if-invalid.json |    3 +
...d-empty.out => alternate-branch-if-invalid.out} |    0
tests/qapi-schema/alternate-empty.err              |    2 +-
tests/qapi-schema/alternate-empty.json             |    4 +-
tests/qapi-schema/args-boxed-empty.err             |    1 -
tests/qapi-schema/args-boxed-empty.json            |    3 -
tests/qapi-schema/args-invalid.err                 |    2 +-
tests/qapi-schema/bad-if-list.err                  |    2 +-
tests/qapi-schema/bad-if-list.json                 |    2 +-
tests/qapi-schema/bad-type-int.err                 |    2 +-
tests/qapi-schema/bad-type-int.json                |    2 +-
tests/qapi-schema/doc-missing-colon.err            |    2 +-
tests/qapi-schema/doc-missing.err                  |    2 +-
tests/qapi-schema/doc-no-symbol.err                |    2 +-
tests/qapi-schema/double-data.err                  |    1 -
tests/qapi-schema/double-data.json                 |    2 -
tests/qapi-schema/duplicate-key.err                |    2 +-
tests/qapi-schema/duplicate-key.json               |    2 +-
tests/qapi-schema/enum-bad-name.err                |    2 +-
tests/qapi-schema/enum-bad-name.json               |    3 +-
tests/qapi-schema/enum-clash-member.err            |    2 +-
tests/qapi-schema/enum-dict-member-unknown.err     |    2 +-
tests/qapi-schema/enum-int-member.err              |    2 +-
tests/qapi-schema/enum-member-case.err             |    2 +-
tests/qapi-schema/escape-outside-string.err        |    2 +-
tests/qapi-schema/escape-outside-string.json       |    3 -
tests/qapi-schema/escape-too-big.err               |    1 -
tests/qapi-schema/escape-too-big.json              |    3 -
tests/qapi-schema/escape-too-short.err             |    1 -
tests/qapi-schema/escape-too-short.json            |    3 -
tests/qapi-schema/features-if-invalid.err          |    1 +
.../{double-data.exit => features-if-invalid.exit} |    0
tests/qapi-schema/features-if-invalid.json         |    4 +
.../{double-data.out => features-if-invalid.out}   |    0
.../flat-union-discriminator-bad-name.err          |    1 +
...exit => flat-union-discriminator-bad-name.exit} |    0
.../flat-union-discriminator-bad-name.json         |   11 +
...g.out => flat-union-discriminator-bad-name.out} |    0
tests/qapi-schema/flat-union-empty.err             |    2 +-
tests/qapi-schema/flat-union-empty.json            |    2 +-
.../flat-union-invalid-discriminator.err           |    2 +-
.../flat-union-invalid-discriminator.json          |    5 +-
.../flat-union-invalid-if-discriminator.err        |    2 +-
.../flat-union-invalid-if-discriminator.json       |    5 +-
.../flat-union-optional-discriminator.err          |    2 +-
.../flat-union-optional-discriminator.json         |    3 +-
tests/qapi-schema/funny-char.err                   |    2 +-
tests/qapi-schema/funny-word.err                   |    1 +
.../{escape-too-big.exit => funny-word.exit}       |    0
tests/qapi-schema/funny-word.json                  |    1 +
.../{escape-too-big.out => funny-word.out}         |    0
tests/qapi-schema/ident-with-escape.err            |    1 +
tests/qapi-schema/ident-with-escape.exit           |    2 +-
tests/qapi-schema/ident-with-escape.json           |    2 +-
tests/qapi-schema/ident-with-escape.out            |   16 -
tests/qapi-schema/include-before-err.err           |    2 +-
tests/qapi-schema/include-format-err.err           |    1 -
tests/qapi-schema/include-format-err.json          |    2 -
tests/qapi-schema/include-nested-err.err           |    2 +-
tests/qapi-schema/leading-comma-list.err           |    2 +-
tests/qapi-schema/leading-comma-object.err         |    2 +-
tests/qapi-schema/missing-colon.err                |    2 +-
tests/qapi-schema/missing-comma-list.err           |    2 +-
tests/qapi-schema/missing-comma-object.err         |    2 +-
tests/qapi-schema/non-objects.err                  |    2 +-
.../pragma-name-case-whitelist-crap.json           |    2 +-
tests/qapi-schema/pragma-non-dict.err              |    2 +-
tests/qapi-schema/pragma-unknown.err               |    1 +
.../{escape-too-short.exit => pragma-unknown.exit} |    0
tests/qapi-schema/pragma-unknown.json              |    1 +
.../{escape-too-short.out => pragma-unknown.out}   |    0
tests/qapi-schema/qapi-schema-test.json            |   13 +-
tests/qapi-schema/qapi-schema-test.out             |   21 +-
tests/qapi-schema/quoted-structural-chars.err      |    2 +-
tests/qapi-schema/string-code-point-127.err        |    1 +
...-format-err.exit => string-code-point-127.exit} |    0
tests/qapi-schema/string-code-point-127.json       |    2 +
...de-format-err.out => string-code-point-127.out} |    0
tests/qapi-schema/string-code-point-31.err         |    1 +
...{unicode-str.exit => string-code-point-31.exit} |    0
tests/qapi-schema/string-code-point-31.json        |    2 +
.../{unicode-str.out => string-code-point-31.out}  |    0
tests/qapi-schema/struct-data-invalid.err          |    2 +-
tests/qapi-schema/struct-member-if-invalid.err     |    1 +
tests/qapi-schema/struct-member-if-invalid.exit    |    1 +
tests/qapi-schema/struct-member-if-invalid.json    |    3 +
tests/qapi-schema/struct-member-if-invalid.out     |    0
tests/qapi-schema/trailing-comma-list.err          |    2 +-
tests/qapi-schema/unclosed-list.err                |    2 +-
tests/qapi-schema/unclosed-object.err              |    2 +-
tests/qapi-schema/unicode-str.err                  |    1 -
tests/qapi-schema/unicode-str.json                 |    2 -
tests/qapi-schema/union-base-empty.err             |    2 +-
tests/qapi-schema/union-branch-if-invalid.err      |    1 +
tests/qapi-schema/union-branch-if-invalid.exit     |    1 +
tests/qapi-schema/union-branch-if-invalid.json     |    6 +
tests/qapi-schema/union-branch-if-invalid.out      |    0
tests/qapi-schema/union-empty.err                  |    2 +-
tests/qapi-schema/union-empty.json                 |    2 +-
tests/qapi-schema/unknown-escape.json              |    2 +-
111 files changed, 971 insertions(+), 785 deletions(-)
create mode 100644 tests/qapi-schema/alternate-branch-if-invalid.err
rename tests/qapi-schema/{args-boxed-empty.exit => alternate-branch-if-invalid.exit} (100%)
create mode 100644 tests/qapi-schema/alternate-branch-if-invalid.json
rename tests/qapi-schema/{args-boxed-empty.out => alternate-branch-if-invalid.out} (100%)
delete mode 100644 tests/qapi-schema/args-boxed-empty.err
delete mode 100644 tests/qapi-schema/args-boxed-empty.json
delete mode 100644 tests/qapi-schema/double-data.err
delete mode 100644 tests/qapi-schema/double-data.json
delete mode 100644 tests/qapi-schema/escape-outside-string.json
delete mode 100644 tests/qapi-schema/escape-too-big.err
delete mode 100644 tests/qapi-schema/escape-too-big.json
delete mode 100644 tests/qapi-schema/escape-too-short.err
delete mode 100644 tests/qapi-schema/escape-too-short.json
create mode 100644 tests/qapi-schema/features-if-invalid.err
rename tests/qapi-schema/{double-data.exit => features-if-invalid.exit} (100%)
create mode 100644 tests/qapi-schema/features-if-invalid.json
rename tests/qapi-schema/{double-data.out => features-if-invalid.out} (100%)
create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.err
rename tests/qapi-schema/{escape-outside-string.exit => flat-union-discriminator-bad-name.exit} (100%)
create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.json
rename tests/qapi-schema/{escape-outside-string.out => flat-union-discriminator-bad-name.out} (100%)
create mode 100644 tests/qapi-schema/funny-word.err
rename tests/qapi-schema/{escape-too-big.exit => funny-word.exit} (100%)
create mode 100644 tests/qapi-schema/funny-word.json
rename tests/qapi-schema/{escape-too-big.out => funny-word.out} (100%)
delete mode 100644 tests/qapi-schema/include-format-err.err
delete mode 100644 tests/qapi-schema/include-format-err.json
create mode 100644 tests/qapi-schema/pragma-unknown.err
rename tests/qapi-schema/{escape-too-short.exit => pragma-unknown.exit} (100%)
create mode 100644 tests/qapi-schema/pragma-unknown.json
rename tests/qapi-schema/{escape-too-short.out => pragma-unknown.out} (100%)
create mode 100644 tests/qapi-schema/string-code-point-127.err
rename tests/qapi-schema/{include-format-err.exit => string-code-point-127.exit} (100%)
create mode 100644 tests/qapi-schema/string-code-point-127.json
rename tests/qapi-schema/{include-format-err.out => string-code-point-127.out} (100%)
create mode 100644 tests/qapi-schema/string-code-point-31.err
rename tests/qapi-schema/{unicode-str.exit => string-code-point-31.exit} (100%)
create mode 100644 tests/qapi-schema/string-code-point-31.json
rename tests/qapi-schema/{unicode-str.out => string-code-point-31.out} (100%)
create mode 100644 tests/qapi-schema/struct-member-if-invalid.err
create mode 100644 tests/qapi-schema/struct-member-if-invalid.exit
create mode 100644 tests/qapi-schema/struct-member-if-invalid.json
create mode 100644 tests/qapi-schema/struct-member-if-invalid.out
delete mode 100644 tests/qapi-schema/unicode-str.err
delete mode 100644 tests/qapi-schema/unicode-str.json
create mode 100644 tests/qapi-schema/union-branch-if-invalid.err
create mode 100644 tests/qapi-schema/union-branch-if-invalid.exit
create mode 100644 tests/qapi-schema/union-branch-if-invalid.json
create mode 100644 tests/qapi-schema/union-branch-if-invalid.out
[PULL 00/37] QAPI patches for 2019-09-24
Posted by Markus Armbruster 4 years, 7 months ago
The following changes since commit 2f93a3ecdd3bb060bd04f698ccafe66efd98563a:

  Merge remote-tracking branch 'remotes/davidhildenbrand/tags/s390x-tcg-2019-09-23' into staging (2019-09-23 15:44:52 +0100)

are available in the Git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2019-09-24

for you to fetch changes up to 56176412e7fcfae1c69e4426d94e856b75358231:

  qapi: Assert .visit() and .check_clash() run only after .check() (2019-09-24 14:07:23 +0200)

----------------------------------------------------------------
QAPI patches for 2019-09-24

----------------------------------------------------------------
Andrey Shinkevich (1):
      make check-unit: use after free in test-opts-visitor

Markus Armbruster (36):
      qapi: Make visit_next_list()'s comment less confusing
      scripts/git.orderfile: Match QAPI schema more precisely
      qapi: Drop check_type()'s redundant parameter @allow_optional
      qapi: Drop support for boxed alternate arguments
      docs/devel/qapi-code-gen: Minor specification fixes
      tests/qapi-schema: Demonstrate bad reporting of funny characters
      qapi: Restrict strings to printable ASCII
      qapi: Drop support for escape sequences other than \\
      qapi: Permit 'boxed' with empty type
      qapi: Permit alternates with just one branch
      qapi: Permit omitting all flat union branches
      qapi: Adjust frontend errors to say enum value, not member
      docs/devel/qapi-code-gen: Reorder sections for readability
      docs/devel/qapi-code-gen: Rewrite compatibility considerations
      docs/devel/qapi-code-gen: Rewrite introduction to schema
      docs/devel/qapi-code-gen: Improve QAPI schema language doc
      qapi: Tweak code to match docs/devel/qapi-code-gen.txt
      tests/qapi-schema: Cover unknown pragma
      tests/qapi-schema: Delete two redundant tests
      tests/qapi-schema: Demonstrate misleading optional tag error
      tests/qapi-schema: Demonstrate broken discriminator errors
      tests/qapi-schema: Demonstrate insufficient 'if' checking
      tests/qapi-schema: Demonstrate suboptimal lexical errors
      qapi: Use quotes more consistently in frontend error messages
      qapi: Improve reporting of lexical errors
      qapi: Remove null from schema language
      qapi: Fix broken discriminator error messages
      qapi: Reject blank 'if' conditions in addition to empty ones
      qapi: Fix missing 'if' checks in struct, union, alternate 'data'
      qapi: Normalize 'if' in check_exprs(), like other sugar
      qapi: Simplify check_keys()
      qapi: Clean up around check_known_keys()
      qapi: Delete useless check_exprs() code for simple union kind
      qapi: Fix to .check() empty structs just once
      qapi: Fix excessive QAPISchemaEntity.check() recursion
      qapi: Assert .visit() and .check_clash() run only after .check()

 docs/devel/qapi-code-gen.txt                       | 1075 +++++++++++---------
 include/qapi/visitor.h                             |    8 +-
 qapi/opts-visitor.c                                |   26 +-
 tests/test-qmp-cmds.c                              |    4 +
 scripts/git.orderfile                              |    4 +-
 scripts/qapi/commands.py                           |    4 +-
 scripts/qapi/common.py                             |  380 ++++---
 scripts/qapi/events.py                             |   12 +-
 tests/Makefile.include                             |   16 +-
 tests/qapi-schema/alternate-branch-if-invalid.err  |    1 +
 ...empty.exit => alternate-branch-if-invalid.exit} |    0
 tests/qapi-schema/alternate-branch-if-invalid.json |    3 +
 ...d-empty.out => alternate-branch-if-invalid.out} |    0
 tests/qapi-schema/alternate-empty.err              |    2 +-
 tests/qapi-schema/alternate-empty.json             |    4 +-
 tests/qapi-schema/args-boxed-empty.err             |    1 -
 tests/qapi-schema/args-boxed-empty.json            |    3 -
 tests/qapi-schema/args-invalid.err                 |    2 +-
 tests/qapi-schema/bad-if-list.err                  |    2 +-
 tests/qapi-schema/bad-if-list.json                 |    2 +-
 tests/qapi-schema/bad-type-int.err                 |    2 +-
 tests/qapi-schema/bad-type-int.json                |    2 +-
 tests/qapi-schema/doc-missing-colon.err            |    2 +-
 tests/qapi-schema/doc-missing.err                  |    2 +-
 tests/qapi-schema/doc-no-symbol.err                |    2 +-
 tests/qapi-schema/double-data.err                  |    1 -
 tests/qapi-schema/double-data.json                 |    2 -
 tests/qapi-schema/duplicate-key.err                |    2 +-
 tests/qapi-schema/duplicate-key.json               |    2 +-
 tests/qapi-schema/enum-bad-name.err                |    2 +-
 tests/qapi-schema/enum-bad-name.json               |    3 +-
 tests/qapi-schema/enum-clash-member.err            |    2 +-
 tests/qapi-schema/enum-dict-member-unknown.err     |    2 +-
 tests/qapi-schema/enum-int-member.err              |    2 +-
 tests/qapi-schema/enum-member-case.err             |    2 +-
 tests/qapi-schema/escape-outside-string.err        |    2 +-
 tests/qapi-schema/escape-outside-string.json       |    3 -
 tests/qapi-schema/escape-too-big.err               |    1 -
 tests/qapi-schema/escape-too-big.json              |    3 -
 tests/qapi-schema/escape-too-short.err             |    1 -
 tests/qapi-schema/escape-too-short.json            |    3 -
 tests/qapi-schema/features-if-invalid.err          |    1 +
 .../{double-data.exit => features-if-invalid.exit} |    0
 tests/qapi-schema/features-if-invalid.json         |    4 +
 .../{double-data.out => features-if-invalid.out}   |    0
 .../flat-union-discriminator-bad-name.err          |    1 +
 ...exit => flat-union-discriminator-bad-name.exit} |    0
 .../flat-union-discriminator-bad-name.json         |   11 +
 ...g.out => flat-union-discriminator-bad-name.out} |    0
 tests/qapi-schema/flat-union-empty.err             |    2 +-
 tests/qapi-schema/flat-union-empty.json            |    2 +-
 .../flat-union-invalid-discriminator.err           |    2 +-
 .../flat-union-invalid-discriminator.json          |    5 +-
 .../flat-union-invalid-if-discriminator.err        |    2 +-
 .../flat-union-invalid-if-discriminator.json       |    5 +-
 .../flat-union-optional-discriminator.err          |    2 +-
 .../flat-union-optional-discriminator.json         |    3 +-
 tests/qapi-schema/funny-char.err                   |    2 +-
 tests/qapi-schema/funny-word.err                   |    1 +
 .../{escape-too-big.exit => funny-word.exit}       |    0
 tests/qapi-schema/funny-word.json                  |    1 +
 .../{escape-too-big.out => funny-word.out}         |    0
 tests/qapi-schema/ident-with-escape.err            |    1 +
 tests/qapi-schema/ident-with-escape.exit           |    2 +-
 tests/qapi-schema/ident-with-escape.json           |    2 +-
 tests/qapi-schema/ident-with-escape.out            |   16 -
 tests/qapi-schema/include-before-err.err           |    2 +-
 tests/qapi-schema/include-format-err.err           |    1 -
 tests/qapi-schema/include-format-err.json          |    2 -
 tests/qapi-schema/include-nested-err.err           |    2 +-
 tests/qapi-schema/leading-comma-list.err           |    2 +-
 tests/qapi-schema/leading-comma-object.err         |    2 +-
 tests/qapi-schema/missing-colon.err                |    2 +-
 tests/qapi-schema/missing-comma-list.err           |    2 +-
 tests/qapi-schema/missing-comma-object.err         |    2 +-
 tests/qapi-schema/non-objects.err                  |    2 +-
 .../pragma-name-case-whitelist-crap.json           |    2 +-
 tests/qapi-schema/pragma-non-dict.err              |    2 +-
 tests/qapi-schema/pragma-unknown.err               |    1 +
 .../{escape-too-short.exit => pragma-unknown.exit} |    0
 tests/qapi-schema/pragma-unknown.json              |    1 +
 .../{escape-too-short.out => pragma-unknown.out}   |    0
 tests/qapi-schema/qapi-schema-test.json            |   13 +-
 tests/qapi-schema/qapi-schema-test.out             |   21 +-
 tests/qapi-schema/quoted-structural-chars.err      |    2 +-
 tests/qapi-schema/string-code-point-127.err        |    1 +
 ...-format-err.exit => string-code-point-127.exit} |    0
 tests/qapi-schema/string-code-point-127.json       |    2 +
 ...de-format-err.out => string-code-point-127.out} |    0
 tests/qapi-schema/string-code-point-31.err         |    1 +
 ...{unicode-str.exit => string-code-point-31.exit} |    0
 tests/qapi-schema/string-code-point-31.json        |    2 +
 .../{unicode-str.out => string-code-point-31.out}  |    0
 tests/qapi-schema/struct-data-invalid.err          |    2 +-
 tests/qapi-schema/struct-member-if-invalid.err     |    1 +
 tests/qapi-schema/struct-member-if-invalid.exit    |    1 +
 tests/qapi-schema/struct-member-if-invalid.json    |    3 +
 tests/qapi-schema/struct-member-if-invalid.out     |    0
 tests/qapi-schema/trailing-comma-list.err          |    2 +-
 tests/qapi-schema/unclosed-list.err                |    2 +-
 tests/qapi-schema/unclosed-object.err              |    2 +-
 tests/qapi-schema/unicode-str.err                  |    1 -
 tests/qapi-schema/unicode-str.json                 |    2 -
 tests/qapi-schema/union-base-empty.err             |    2 +-
 tests/qapi-schema/union-branch-if-invalid.err      |    1 +
 tests/qapi-schema/union-branch-if-invalid.exit     |    1 +
 tests/qapi-schema/union-branch-if-invalid.json     |    6 +
 tests/qapi-schema/union-branch-if-invalid.out      |    0
 tests/qapi-schema/union-empty.err                  |    2 +-
 tests/qapi-schema/union-empty.json                 |    2 +-
 tests/qapi-schema/unknown-escape.json              |    2 +-
 111 files changed, 971 insertions(+), 785 deletions(-)
 create mode 100644 tests/qapi-schema/alternate-branch-if-invalid.err
 rename tests/qapi-schema/{args-boxed-empty.exit => alternate-branch-if-invalid.exit} (100%)
 create mode 100644 tests/qapi-schema/alternate-branch-if-invalid.json
 rename tests/qapi-schema/{args-boxed-empty.out => alternate-branch-if-invalid.out} (100%)
 delete mode 100644 tests/qapi-schema/args-boxed-empty.err
 delete mode 100644 tests/qapi-schema/args-boxed-empty.json
 delete mode 100644 tests/qapi-schema/double-data.err
 delete mode 100644 tests/qapi-schema/double-data.json
 delete mode 100644 tests/qapi-schema/escape-outside-string.json
 delete mode 100644 tests/qapi-schema/escape-too-big.err
 delete mode 100644 tests/qapi-schema/escape-too-big.json
 delete mode 100644 tests/qapi-schema/escape-too-short.err
 delete mode 100644 tests/qapi-schema/escape-too-short.json
 create mode 100644 tests/qapi-schema/features-if-invalid.err
 rename tests/qapi-schema/{double-data.exit => features-if-invalid.exit} (100%)
 create mode 100644 tests/qapi-schema/features-if-invalid.json
 rename tests/qapi-schema/{double-data.out => features-if-invalid.out} (100%)
 create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.err
 rename tests/qapi-schema/{escape-outside-string.exit => flat-union-discriminator-bad-name.exit} (100%)
 create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.json
 rename tests/qapi-schema/{escape-outside-string.out => flat-union-discriminator-bad-name.out} (100%)
 create mode 100644 tests/qapi-schema/funny-word.err
 rename tests/qapi-schema/{escape-too-big.exit => funny-word.exit} (100%)
 create mode 100644 tests/qapi-schema/funny-word.json
 rename tests/qapi-schema/{escape-too-big.out => funny-word.out} (100%)
 delete mode 100644 tests/qapi-schema/include-format-err.err
 delete mode 100644 tests/qapi-schema/include-format-err.json
 create mode 100644 tests/qapi-schema/pragma-unknown.err
 rename tests/qapi-schema/{escape-too-short.exit => pragma-unknown.exit} (100%)
 create mode 100644 tests/qapi-schema/pragma-unknown.json
 rename tests/qapi-schema/{escape-too-short.out => pragma-unknown.out} (100%)
 create mode 100644 tests/qapi-schema/string-code-point-127.err
 rename tests/qapi-schema/{include-format-err.exit => string-code-point-127.exit} (100%)
 create mode 100644 tests/qapi-schema/string-code-point-127.json
 rename tests/qapi-schema/{include-format-err.out => string-code-point-127.out} (100%)
 create mode 100644 tests/qapi-schema/string-code-point-31.err
 rename tests/qapi-schema/{unicode-str.exit => string-code-point-31.exit} (100%)
 create mode 100644 tests/qapi-schema/string-code-point-31.json
 rename tests/qapi-schema/{unicode-str.out => string-code-point-31.out} (100%)
 create mode 100644 tests/qapi-schema/struct-member-if-invalid.err
 create mode 100644 tests/qapi-schema/struct-member-if-invalid.exit
 create mode 100644 tests/qapi-schema/struct-member-if-invalid.json
 create mode 100644 tests/qapi-schema/struct-member-if-invalid.out
 delete mode 100644 tests/qapi-schema/unicode-str.err
 delete mode 100644 tests/qapi-schema/unicode-str.json
 create mode 100644 tests/qapi-schema/union-branch-if-invalid.err
 create mode 100644 tests/qapi-schema/union-branch-if-invalid.exit
 create mode 100644 tests/qapi-schema/union-branch-if-invalid.json
 create mode 100644 tests/qapi-schema/union-branch-if-invalid.out

-- 
2.21.0


Re: [PULL 00/37] QAPI patches for 2019-09-24
Posted by no-reply@patchew.org 4 years, 7 months ago
Patchew URL: https://patchew.org/QEMU/20190924123334.30645-1-armbru@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20190924123334.30645-1-armbru@redhat.com
Subject: [PULL 00/37] QAPI patches for 2019-09-24

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 - [tag update]      patchew/20190918130633.4872-1-shameerali.kolothum.thodi@huawei.com -> patchew/20190918130633.4872-1-shameerali.kolothum.thodi@huawei.com
Auto packing the repository for optimum performance. You may also
run "git gc" manually. See "git help gc" for more information.
Switched to a new branch 'test'
fca7965 qapi: Assert .visit() and .check_clash() run only after .check()
1dee36f qapi: Fix excessive QAPISchemaEntity.check() recursion
67296b6 qapi: Fix to .check() empty structs just once
5df7aa4 qapi: Delete useless check_exprs() code for simple union kind
9bfd443 qapi: Clean up around check_known_keys()
6f36de8 qapi: Simplify check_keys()
f4fdcc8 qapi: Normalize 'if' in check_exprs(), like other sugar
886f5a9 qapi: Fix missing 'if' checks in struct, union, alternate 'data'
1646435 qapi: Reject blank 'if' conditions in addition to empty ones
46fb782 qapi: Fix broken discriminator error messages
66f3e2f qapi: Remove null from schema language
109b4b8 qapi: Improve reporting of lexical errors
780e43a qapi: Use quotes more consistently in frontend error messages
3befc8b tests/qapi-schema: Demonstrate suboptimal lexical errors
93a6e44 tests/qapi-schema: Demonstrate insufficient 'if' checking
1ed8709 tests/qapi-schema: Demonstrate broken discriminator errors
9b5253f tests/qapi-schema: Demonstrate misleading optional tag error
e478cdf tests/qapi-schema: Delete two redundant tests
e440f86 tests/qapi-schema: Cover unknown pragma
41391c5 qapi: Tweak code to match docs/devel/qapi-code-gen.txt
8e35fe1 docs/devel/qapi-code-gen: Improve QAPI schema language doc
886b3d4 docs/devel/qapi-code-gen: Rewrite introduction to schema
d1e96d8 docs/devel/qapi-code-gen: Rewrite compatibility considerations
d5959c2 docs/devel/qapi-code-gen: Reorder sections for readability
915a37a qapi: Adjust frontend errors to say enum value, not member
6538fc9 qapi: Permit omitting all flat union branches
417683b qapi: Permit alternates with just one branch
35d1a1a qapi: Permit 'boxed' with empty type
ad5a002 qapi: Drop support for escape sequences other than \\
37e2210 qapi: Restrict strings to printable ASCII
e95c677 tests/qapi-schema: Demonstrate bad reporting of funny characters
172dafd docs/devel/qapi-code-gen: Minor specification fixes
c33926d qapi: Drop support for boxed alternate arguments
25f22f3 qapi: Drop check_type()'s redundant parameter @allow_optional
6a914ec scripts/git.orderfile: Match QAPI schema more precisely
017b60e make check-unit: use after free in test-opts-visitor
a9711ba qapi: Make visit_next_list()'s comment less confusing

=== OUTPUT BEGIN ===
1/37 Checking commit a9711ba87218 (qapi: Make visit_next_list()'s comment less confusing)
2/37 Checking commit 017b60eb5cb9 (make check-unit: use after free in test-opts-visitor)
3/37 Checking commit 6a914ec905eb (scripts/git.orderfile: Match QAPI schema more precisely)
4/37 Checking commit 25f22f3a0fa1 (qapi: Drop check_type()'s redundant parameter @allow_optional)
5/37 Checking commit c33926d14c78 (qapi: Drop support for boxed alternate arguments)
6/37 Checking commit 172dafd2d40d (docs/devel/qapi-code-gen: Minor specification fixes)
7/37 Checking commit e95c677acdb7 (tests/qapi-schema: Demonstrate bad reporting of funny characters)
8/37 Checking commit 37e22103c527 (qapi: Restrict strings to printable ASCII)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#110: 
new file mode 100644

ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
#127: FILE: tests/qapi-schema/string-code-point-127.json:2:
+{ 'command': '⌦' }
               ^

ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
#153: FILE: tests/qapi-schema/string-code-point-31.json:2:
+{ 'command': '␟' }
               ^

total: 2 errors, 1 warnings, 76 lines checked

Patch 8/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

9/37 Checking commit ad5a0020e820 (qapi: Drop support for escape sequences other than \\)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#75: 
deleted file mode 100644

total: 0 errors, 1 warnings, 53 lines checked

Patch 9/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
10/37 Checking commit 35d1a1a20963 (qapi: Permit 'boxed' with empty type)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#131: 
deleted file mode 100644

total: 0 errors, 1 warnings, 129 lines checked

Patch 10/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
11/37 Checking commit 417683ba43fa (qapi: Permit alternates with just one branch)
12/37 Checking commit 6538fc9fa42b (qapi: Permit omitting all flat union branches)
13/37 Checking commit 915a37a4eecd (qapi: Adjust frontend errors to say enum value, not member)
14/37 Checking commit d5959c29193e (docs/devel/qapi-code-gen: Reorder sections for readability)
15/37 Checking commit d1e96d83a97f (docs/devel/qapi-code-gen: Rewrite compatibility considerations)
16/37 Checking commit 886b3d4a9b69 (docs/devel/qapi-code-gen: Rewrite introduction to schema)
17/37 Checking commit 8e35fe16b761 (docs/devel/qapi-code-gen: Improve QAPI schema language doc)
18/37 Checking commit 41391c527ffc (qapi: Tweak code to match docs/devel/qapi-code-gen.txt)
19/37 Checking commit e440f8624eba (tests/qapi-schema: Cover unknown pragma)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#25: 
new file mode 100644

total: 0 errors, 1 warnings, 10 lines checked

Patch 19/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
20/37 Checking commit e478cdf5f30f (tests/qapi-schema: Delete two redundant tests)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#41: 
deleted file mode 100644

total: 0 errors, 1 warnings, 18 lines checked

Patch 20/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
21/37 Checking commit 9b5253f1cce0 (tests/qapi-schema: Demonstrate misleading optional tag error)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#41: 
new file mode 100644

total: 0 errors, 1 warnings, 34 lines checked

Patch 21/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
22/37 Checking commit 1ed8709cff6f (tests/qapi-schema: Demonstrate broken discriminator errors)
23/37 Checking commit 93a6e4434ee7 (tests/qapi-schema: Demonstrate insufficient 'if' checking)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#53: 
new file mode 100644

total: 0 errors, 1 warnings, 120 lines checked

Patch 23/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
24/37 Checking commit 3befc8b02156 (tests/qapi-schema: Demonstrate suboptimal lexical errors)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#38: 
new file mode 100644

total: 0 errors, 1 warnings, 14 lines checked

Patch 24/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
25/37 Checking commit 780e43ac4ae8 (qapi: Use quotes more consistently in frontend error messages)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#164: 
new file mode 100644

total: 0 errors, 1 warnings, 146 lines checked

Patch 25/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
26/37 Checking commit 109b4b89f1f3 (qapi: Improve reporting of lexical errors)
27/37 Checking commit 66f3e2fdfea8 (qapi: Remove null from schema language)
28/37 Checking commit 46fb7827e670 (qapi: Fix broken discriminator error messages)
29/37 Checking commit 16464352bdb8 (qapi: Reject blank 'if' conditions in addition to empty ones)
30/37 Checking commit 886f5a9e9a15 (qapi: Fix missing 'if' checks in struct, union, alternate 'data')
31/37 Checking commit f4fdcc853a48 (qapi: Normalize 'if' in check_exprs(), like other sugar)
32/37 Checking commit 6f36de8c07ee (qapi: Simplify check_keys())
33/37 Checking commit 9bfd443bcb0a (qapi: Clean up around check_known_keys())
34/37 Checking commit 5df7aa47a9ba (qapi: Delete useless check_exprs() code for simple union kind)
35/37 Checking commit 67296b6e3775 (qapi: Fix to .check() empty structs just once)
36/37 Checking commit 1dee36ff6bf8 (qapi: Fix excessive QAPISchemaEntity.check() recursion)
37/37 Checking commit fca7965dc1e6 (qapi: Assert .visit() and .check_clash() run only after .check())
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20190924123334.30645-1-armbru@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Re: [PULL 00/37] QAPI patches for 2019-09-24
Posted by no-reply@patchew.org 4 years, 7 months ago
Patchew URL: https://patchew.org/QEMU/20190924123334.30645-1-armbru@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20190924123334.30645-1-armbru@redhat.com
Subject: [PULL 00/37] QAPI patches for 2019-09-24

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Switched to a new branch 'test'
94bb71a qapi: Assert .visit() and .check_clash() run only after .check()
e235213 qapi: Fix excessive QAPISchemaEntity.check() recursion
6abca0e qapi: Fix to .check() empty structs just once
474e373 qapi: Delete useless check_exprs() code for simple union kind
e8046dc qapi: Clean up around check_known_keys()
e04348f qapi: Simplify check_keys()
88e075d qapi: Normalize 'if' in check_exprs(), like other sugar
7aa7ae2 qapi: Fix missing 'if' checks in struct, union, alternate 'data'
85793e7 qapi: Reject blank 'if' conditions in addition to empty ones
a0f2b57 qapi: Fix broken discriminator error messages
300d20c qapi: Remove null from schema language
d7b3044 qapi: Improve reporting of lexical errors
ae7d3b9 qapi: Use quotes more consistently in frontend error messages
c390bd2 tests/qapi-schema: Demonstrate suboptimal lexical errors
fc20fdc tests/qapi-schema: Demonstrate insufficient 'if' checking
06b681b tests/qapi-schema: Demonstrate broken discriminator errors
d042260 tests/qapi-schema: Demonstrate misleading optional tag error
897d892 tests/qapi-schema: Delete two redundant tests
110d38a tests/qapi-schema: Cover unknown pragma
d43d15e qapi: Tweak code to match docs/devel/qapi-code-gen.txt
128b472 docs/devel/qapi-code-gen: Improve QAPI schema language doc
0564225 docs/devel/qapi-code-gen: Rewrite introduction to schema
7596e24 docs/devel/qapi-code-gen: Rewrite compatibility considerations
2dfb8e7 docs/devel/qapi-code-gen: Reorder sections for readability
02f7e54 qapi: Adjust frontend errors to say enum value, not member
432d8bd qapi: Permit omitting all flat union branches
0dcc5f7 qapi: Permit alternates with just one branch
d6e3fbe qapi: Permit 'boxed' with empty type
888703f qapi: Drop support for escape sequences other than \\
0446d61 qapi: Restrict strings to printable ASCII
b1b7662 tests/qapi-schema: Demonstrate bad reporting of funny characters
c106539 docs/devel/qapi-code-gen: Minor specification fixes
9d585b9 qapi: Drop support for boxed alternate arguments
93e25ba qapi: Drop check_type()'s redundant parameter @allow_optional
052b3a4 scripts/git.orderfile: Match QAPI schema more precisely
e44ecb0 make check-unit: use after free in test-opts-visitor
5cf38c1 qapi: Make visit_next_list()'s comment less confusing

=== OUTPUT BEGIN ===
1/37 Checking commit 5cf38c18d9b8 (qapi: Make visit_next_list()'s comment less confusing)
2/37 Checking commit e44ecb08c63d (make check-unit: use after free in test-opts-visitor)
3/37 Checking commit 052b3a49a2f3 (scripts/git.orderfile: Match QAPI schema more precisely)
4/37 Checking commit 93e25bab7a23 (qapi: Drop check_type()'s redundant parameter @allow_optional)
5/37 Checking commit 9d585b933636 (qapi: Drop support for boxed alternate arguments)
6/37 Checking commit c1065396940f (docs/devel/qapi-code-gen: Minor specification fixes)
7/37 Checking commit b1b7662708bf (tests/qapi-schema: Demonstrate bad reporting of funny characters)
8/37 Checking commit 0446d6114ed7 (qapi: Restrict strings to printable ASCII)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#110: 
new file mode 100644

ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
#127: FILE: tests/qapi-schema/string-code-point-127.json:2:
+{ 'command': '⌦' }
               ^

ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
#153: FILE: tests/qapi-schema/string-code-point-31.json:2:
+{ 'command': '␟' }
               ^

total: 2 errors, 1 warnings, 76 lines checked

Patch 8/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

9/37 Checking commit 888703f31123 (qapi: Drop support for escape sequences other than \\)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#75: 
deleted file mode 100644

total: 0 errors, 1 warnings, 53 lines checked

Patch 9/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
10/37 Checking commit d6e3fbe4fa99 (qapi: Permit 'boxed' with empty type)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#131: 
deleted file mode 100644

total: 0 errors, 1 warnings, 129 lines checked

Patch 10/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
11/37 Checking commit 0dcc5f73a05f (qapi: Permit alternates with just one branch)
12/37 Checking commit 432d8bd595d7 (qapi: Permit omitting all flat union branches)
13/37 Checking commit 02f7e541fd74 (qapi: Adjust frontend errors to say enum value, not member)
14/37 Checking commit 2dfb8e7c344b (docs/devel/qapi-code-gen: Reorder sections for readability)
15/37 Checking commit 7596e24f1bec (docs/devel/qapi-code-gen: Rewrite compatibility considerations)
16/37 Checking commit 05642257c0db (docs/devel/qapi-code-gen: Rewrite introduction to schema)
17/37 Checking commit 128b4726448e (docs/devel/qapi-code-gen: Improve QAPI schema language doc)
18/37 Checking commit d43d15e7d540 (qapi: Tweak code to match docs/devel/qapi-code-gen.txt)
19/37 Checking commit 110d38a4a19f (tests/qapi-schema: Cover unknown pragma)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#25: 
new file mode 100644

total: 0 errors, 1 warnings, 10 lines checked

Patch 19/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
20/37 Checking commit 897d892dedcf (tests/qapi-schema: Delete two redundant tests)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#41: 
deleted file mode 100644

total: 0 errors, 1 warnings, 18 lines checked

Patch 20/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
21/37 Checking commit d042260f5405 (tests/qapi-schema: Demonstrate misleading optional tag error)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#41: 
new file mode 100644

total: 0 errors, 1 warnings, 34 lines checked

Patch 21/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
22/37 Checking commit 06b681bc7ab7 (tests/qapi-schema: Demonstrate broken discriminator errors)
23/37 Checking commit fc20fdc04c5b (tests/qapi-schema: Demonstrate insufficient 'if' checking)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#53: 
new file mode 100644

total: 0 errors, 1 warnings, 120 lines checked

Patch 23/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
24/37 Checking commit c390bd203f6a (tests/qapi-schema: Demonstrate suboptimal lexical errors)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#38: 
new file mode 100644

total: 0 errors, 1 warnings, 14 lines checked

Patch 24/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
25/37 Checking commit ae7d3b9c8421 (qapi: Use quotes more consistently in frontend error messages)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#164: 
new file mode 100644

total: 0 errors, 1 warnings, 146 lines checked

Patch 25/37 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
26/37 Checking commit d7b3044af92a (qapi: Improve reporting of lexical errors)
27/37 Checking commit 300d20c4ce3c (qapi: Remove null from schema language)
28/37 Checking commit a0f2b570a4b9 (qapi: Fix broken discriminator error messages)
29/37 Checking commit 85793e79ac65 (qapi: Reject blank 'if' conditions in addition to empty ones)
30/37 Checking commit 7aa7ae279141 (qapi: Fix missing 'if' checks in struct, union, alternate 'data')
31/37 Checking commit 88e075d1fccb (qapi: Normalize 'if' in check_exprs(), like other sugar)
32/37 Checking commit e04348f20e28 (qapi: Simplify check_keys())
33/37 Checking commit e8046dc24358 (qapi: Clean up around check_known_keys())
34/37 Checking commit 474e37349da0 (qapi: Delete useless check_exprs() code for simple union kind)
35/37 Checking commit 6abca0e2ed33 (qapi: Fix to .check() empty structs just once)
36/37 Checking commit e235213891c9 (qapi: Fix excessive QAPISchemaEntity.check() recursion)
37/37 Checking commit 94bb71ada7d7 (qapi: Assert .visit() and .check_clash() run only after .check())
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20190924123334.30645-1-armbru@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Re: [PULL 00/37] QAPI patches for 2019-09-24
Posted by Peter Maydell 4 years, 7 months ago
On Tue, 24 Sep 2019 at 13:42, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit 2f93a3ecdd3bb060bd04f698ccafe66efd98563a:
>
>   Merge remote-tracking branch 'remotes/davidhildenbrand/tags/s390x-tcg-2019-09-23' into staging (2019-09-23 15:44:52 +0100)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2019-09-24
>
> for you to fetch changes up to 56176412e7fcfae1c69e4426d94e856b75358231:
>
>   qapi: Assert .visit() and .check_clash() run only after .check() (2019-09-24 14:07:23 +0200)
>
> ----------------------------------------------------------------
> QAPI patches for 2019-09-24
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.

-- PMM