The following changes since commit 8880cc4362fde4ecdac0b2092318893118206fcf:

  Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20210902' into staging (2021-09-03 08:27:38 +0100)

are available in the Git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2021-09-03

for you to fetch changes up to 34f7b25e575a93182b7c0a3558caac34e26227cf:

  qapi: Tweak error messages for unknown / conflicting 'if' keys (2021-09-03 17:09:10 +0200)

----------------------------------------------------------------
QAPI patches patches for 2021-09-03

----------------------------------------------------------------
Guoyi Tu (1):
      qapi: Set boolean value correctly in examples

Markus Armbruster (12):
      qapi: Simplify QAPISchemaIfCond's interface for generating C
      qapi: Simplify how QAPISchemaIfCond represents "no condition"
      tests/qapi-schema: Correct two 'if' conditionals
      tests/qapi-schema: Demonstrate broken C code for 'if'
      qapi: Fix C code generation for 'if'
      qapi: Factor common recursion out of cgen_ifcond(), docgen_ifcond()
      qapi: Avoid redundant parens in code generated for conditionals
      qapi: Use "not COND" instead of "!COND" for generated documentation
      qapi: Use re.fullmatch() where appropriate
      tests/qapi-schema: Hide OrderedDict in test output
      qapi: Tweak error messages for missing / conflicting meta-type
      qapi: Tweak error messages for unknown / conflicting 'if' keys

 qapi/trace.json                         |  2 +-
 scripts/qapi/common.py                  | 51 +++++++++++++++++++--------------
 scripts/qapi/expr.py                    | 32 +++++++++------------
 scripts/qapi/gen.py                     |  6 ++--
 scripts/qapi/introspect.py              | 11 ++-----
 scripts/qapi/schema.py                  | 12 ++++++--
 scripts/qapi/types.py                   | 28 +++++++-----------
 scripts/qapi/visit.py                   | 14 ++++-----
 tests/qapi-schema/bad-if-key.err        |  2 +-
 tests/qapi-schema/bad-if-keys.err       |  2 +-
 tests/qapi-schema/doc-good.json         |  2 +-
 tests/qapi-schema/doc-good.out          |  6 ++--
 tests/qapi-schema/doc-good.txt          |  8 +++---
 tests/qapi-schema/double-type.err       |  4 +--
 tests/qapi-schema/enum-if-invalid.err   |  2 +-
 tests/qapi-schema/missing-type.err      |  2 +-
 tests/qapi-schema/qapi-schema-test.json |  9 ++++--
 tests/qapi-schema/qapi-schema-test.out  | 31 +++++++++++---------
 tests/qapi-schema/test-qapi.py          | 11 ++++++-
 19 files changed, 121 insertions(+), 114 deletions(-)

-- 
2.31.1

On Fri, 3 Sept 2021 at 20:32, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit 8880cc4362fde4ecdac0b2092318893118206fcf:
>
>   Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20210902' into staging (2021-09-03 08:27:38 +0100)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2021-09-03
>
> for you to fetch changes up to 34f7b25e575a93182b7c0a3558caac34e26227cf:
>
>   qapi: Tweak error messages for unknown / conflicting 'if' keys (2021-09-03 17:09:10 +0200)
>
> ----------------------------------------------------------------
> QAPI patches patches for 2021-09-03
>


Applied, thanks.

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

-- PMM