The following changes since commit 0748b3526e8cb78b9cd64208426bfc3d54a72b04:

  Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging (2017-05-30 14:15:15 +0100)

are available in the git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2017-05-31

for you to fetch changes up to c0644771ebedbd8f47f3c24816445e30111d226b:

  qapi: Reject alternates that can't work with keyval_parse() (2017-05-31 16:04:09 +0200)

----------------------------------------------------------------
QAPI patches for 2017-05-31

----------------------------------------------------------------
Markus Armbruster (4):
      qobject-input-visitor: Reject non-finite numbers with keyval
      qapi: Document visit_type_any() issues with keyval input
      tests/qapi-schema: Avoid 'str' in alternate test cases
      qapi: Reject alternates that can't work with keyval_parse()

 include/qapi/visitor.h                             |  4 ++
 qapi/qobject-input-visitor.c                       |  3 +-
 scripts/qapi.py                                    | 19 ++++++-
 tests/Makefile.include                             |  2 +
 tests/qapi-schema/alternate-clash.json             |  2 +-
 tests/qapi-schema/alternate-conflict-dict.json     |  2 +-
 tests/qapi-schema/alternate-conflict-enum-bool.err |  1 +
 .../qapi-schema/alternate-conflict-enum-bool.exit  |  1 +
 .../qapi-schema/alternate-conflict-enum-bool.json  |  6 +++
 tests/qapi-schema/alternate-conflict-enum-bool.out |  0
 tests/qapi-schema/alternate-conflict-enum-int.err  |  1 +
 tests/qapi-schema/alternate-conflict-enum-int.exit |  1 +
 tests/qapi-schema/alternate-conflict-enum-int.json |  6 +++
 tests/qapi-schema/alternate-conflict-enum-int.out  |  0
 tests/qapi-schema/alternate-conflict-string.err    |  2 +-
 tests/qapi-schema/alternate-conflict-string.json   |  6 +--
 tests/qapi-schema/alternate-nested.json            |  2 +-
 tests/qapi-schema/args-alternate.json              |  2 +-
 tests/qapi-schema/doc-bad-alternate-member.json    |  2 +-
 tests/qapi-schema/qapi-schema-test.json            | 13 +++--
 tests/qapi-schema/qapi-schema-test.out             | 34 ++++++------
 tests/qapi-schema/returns-alternate.json           |  2 +-
 tests/test-clone-visitor.c                         | 23 ++++----
 tests/test-keyval.c                                | 18 ++++---
 tests/test-qobject-input-visitor.c                 | 62 ++++++++++++----------
 tests/test-qobject-output-visitor.c                |  4 +-
 util/keyval.c                                      | 10 ++--
 27 files changed, 140 insertions(+), 88 deletions(-)
 create mode 100644 tests/qapi-schema/alternate-conflict-enum-bool.err
 create mode 100644 tests/qapi-schema/alternate-conflict-enum-bool.exit
 create mode 100644 tests/qapi-schema/alternate-conflict-enum-bool.json
 create mode 100644 tests/qapi-schema/alternate-conflict-enum-bool.out
 create mode 100644 tests/qapi-schema/alternate-conflict-enum-int.err
 create mode 100644 tests/qapi-schema/alternate-conflict-enum-int.exit
 create mode 100644 tests/qapi-schema/alternate-conflict-enum-int.json
 create mode 100644 tests/qapi-schema/alternate-conflict-enum-int.out

-- 
2.7.4

On 31 May 2017 at 18:09, Markus Armbruster <armbru@redhat.com> wrote:
> The following changes since commit 0748b3526e8cb78b9cd64208426bfc3d54a72b04:
>
>   Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging (2017-05-30 14:15:15 +0100)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2017-05-31
>
> for you to fetch changes up to c0644771ebedbd8f47f3c24816445e30111d226b:
>
>   qapi: Reject alternates that can't work with keyval_parse() (2017-05-31 16:04:09 +0200)
>
> ----------------------------------------------------------------
> QAPI patches for 2017-05-31
>
> ----------------------------------------------------------------
> Markus Armbruster (4):
>       qobject-input-visitor: Reject non-finite numbers with keyval
>       qapi: Document visit_type_any() issues with keyval input
>       tests/qapi-schema: Avoid 'str' in alternate test cases
>       qapi: Reject alternates that can't work with keyval_parse()
>

Applied, thanks.

-- PMM