The following changes since commit b37686f7e84b22cfaf7fd01ac5133f2617cc3027:
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request'
into staging (2015-10-09 12:18:14 +0100)
are available in the git repository at:
git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2015-10-09
for you to fetch changes up to 51c605bab50f1b9e0766aa9ed14c1abe58eb7f48:
qapi: Simplify gen_visit_fields() error handling (2015-10-09 16:44:10 +0200)
----------------------------------------------------------------
QAPI patches
----------------------------------------------------------------
Eric Blake (17):
qapi: Sort qapi-schema tests
qapi: Improve 'include' error message
qapi: Invoke exception superclass initializer
qapi: Clean up qapi.py per pep8
qapi: Test for various name collisions
qapi: Avoid assertion failure on union 'type' collision
qapi: Add tests for empty unions
qapi: Test use of 'number' within alternates
qapi: Reuse code for flat union base validation
qapi: Consistent generated code: prefer error 'err'
qapi: Consistent generated code: prefer visitor 'v'
qapi: Consistent generated code: prefer common labels
qapi: Consistent generated code: prefer common indentation
qapi: Consistent generated code: minimize push_indent() usage
qapi: Share gen_err_check()
qapi: Share gen_visit_fields()
qapi: Simplify gen_visit_fields() error handling
Markus Armbruster (3):
docs: Move files from docs/qmp/ to docs/
MAINTAINERS: Specify QObject include and test files
MAINTAINERS: Specify QAPI include and test files
MAINTAINERS | 15 +-
docs/qapi-code-gen.txt | 102 ++++-----
docs/{qmp => }/qmp-events.txt | 0
docs/{qmp/README => qmp-intro.txt} | 0
docs/{qmp => }/qmp-spec.txt | 0
qom/object.c | 18 +-
qom/qom-qobject.c | 18 +-
scripts/ordereddict.py | 3 +-
scripts/qapi-commands.py | 110 +++-------
scripts/qapi-event.py | 55 +----
scripts/qapi-types.py | 8 +-
scripts/qapi-visit.py | 141 +++++-------
scripts/qapi.py | 240 +++++++++++++++------
tests/Makefile | 170 +++++++++++----
tests/qapi-schema/alternate-clash.err | 2 +-
tests/qapi-schema/alternate-clash.json | 9 +-
...-union-branch-clash.out => alternate-empty.err} | 0
tests/qapi-schema/alternate-empty.exit | 1 +
tests/qapi-schema/alternate-empty.json | 2 +
tests/qapi-schema/alternate-empty.out | 4 +
tests/qapi-schema/alternate-nested.json | 2 +-
tests/qapi-schema/alternate-unknown.json | 2 +-
tests/qapi-schema/args-name-clash.err | 0
tests/qapi-schema/args-name-clash.exit | 1 +
tests/qapi-schema/args-name-clash.json | 5 +
tests/qapi-schema/args-name-clash.out | 6 +
tests/qapi-schema/duplicate-key.err | 2 +-
tests/qapi-schema/duplicate-key.json | 1 +
tests/qapi-schema/flat-union-bad-base.err | 2 +-
tests/qapi-schema/flat-union-base-any.err | 2 +-
tests/qapi-schema/flat-union-base-union.err | 2 +-
tests/qapi-schema/flat-union-base-union.json | 5 +-
tests/qapi-schema/flat-union-branch-clash.err | 1 -
tests/qapi-schema/flat-union-clash-branch.err | 0
tests/qapi-schema/flat-union-clash-branch.exit | 1 +
tests/qapi-schema/flat-union-clash-branch.json | 18 ++
tests/qapi-schema/flat-union-clash-branch.out | 14 ++
tests/qapi-schema/flat-union-clash-member.err | 1 +
...nch-clash.exit => flat-union-clash-member.exit} | 0
...nch-clash.json => flat-union-clash-member.json} | 3 +-
tests/qapi-schema/flat-union-clash-member.out | 0
tests/qapi-schema/flat-union-clash-type.err | 1 +
tests/qapi-schema/flat-union-clash-type.exit | 1 +
tests/qapi-schema/flat-union-clash-type.json | 14 ++
tests/qapi-schema/flat-union-clash-type.out | 0
tests/qapi-schema/flat-union-empty.err | 0
tests/qapi-schema/flat-union-empty.exit | 1 +
tests/qapi-schema/flat-union-empty.json | 4 +
tests/qapi-schema/flat-union-empty.out | 7 +
tests/qapi-schema/flat-union-inline.err | 2 +-
tests/qapi-schema/flat-union-inline.json | 4 +-
tests/qapi-schema/flat-union-no-base.err | 2 +-
tests/qapi-schema/include-non-file.err | 2 +-
tests/qapi-schema/include-non-file.json | 2 +-
tests/qapi-schema/qapi-schema-test.json | 15 +-
tests/qapi-schema/qapi-schema-test.out | 26 +++
tests/qapi-schema/struct-base-clash-base.err | 0
tests/qapi-schema/struct-base-clash-base.exit | 1 +
tests/qapi-schema/struct-base-clash-base.json | 9 +
tests/qapi-schema/struct-base-clash-base.out | 5 +
tests/qapi-schema/struct-base-clash-deep.err | 2 +-
tests/qapi-schema/struct-base-clash-deep.json | 5 +-
tests/qapi-schema/struct-base-clash.err | 2 +-
tests/qapi-schema/struct-base-clash.json | 3 +-
tests/qapi-schema/union-clash-branches.err | 1 +
tests/qapi-schema/union-clash-branches.exit | 1 +
tests/qapi-schema/union-clash-branches.json | 5 +
tests/qapi-schema/union-clash-branches.out | 0
tests/qapi-schema/union-clash-data.err | 0
tests/qapi-schema/union-clash-data.exit | 1 +
tests/qapi-schema/union-clash-data.json | 7 +
tests/qapi-schema/union-clash-data.out | 6 +
tests/qapi-schema/union-clash-type.err | 1 +
tests/qapi-schema/union-clash-type.exit | 1 +
tests/qapi-schema/union-clash-type.json | 9 +
tests/qapi-schema/union-clash-type.out | 0
tests/qapi-schema/union-empty.err | 0
tests/qapi-schema/union-empty.exit | 1 +
tests/qapi-schema/union-empty.json | 2 +
tests/qapi-schema/union-empty.out | 3 +
tests/qapi-schema/union-invalid-base.err | 2 +-
tests/test-qmp-input-visitor.c | 131 ++++++++++-
82 files changed, 821 insertions(+), 424 deletions(-)
rename docs/{qmp => }/qmp-events.txt (100%)
rename docs/{qmp/README => qmp-intro.txt} (100%)
rename docs/{qmp => }/qmp-spec.txt (100%)
rename tests/qapi-schema/{flat-union-branch-clash.out => alternate-empty.err}
(100%)
create mode 100644 tests/qapi-schema/alternate-empty.exit
create mode 100644 tests/qapi-schema/alternate-empty.json
create mode 100644 tests/qapi-schema/alternate-empty.out
create mode 100644 tests/qapi-schema/args-name-clash.err
create mode 100644 tests/qapi-schema/args-name-clash.exit
create mode 100644 tests/qapi-schema/args-name-clash.json
create mode 100644 tests/qapi-schema/args-name-clash.out
delete mode 100644 tests/qapi-schema/flat-union-branch-clash.err
create mode 100644 tests/qapi-schema/flat-union-clash-branch.err
create mode 100644 tests/qapi-schema/flat-union-clash-branch.exit
create mode 100644 tests/qapi-schema/flat-union-clash-branch.json
create mode 100644 tests/qapi-schema/flat-union-clash-branch.out
create mode 100644 tests/qapi-schema/flat-union-clash-member.err
rename tests/qapi-schema/{flat-union-branch-clash.exit =>
flat-union-clash-member.exit} (100%)
rename tests/qapi-schema/{flat-union-branch-clash.json =>
flat-union-clash-member.json} (77%)
create mode 100644 tests/qapi-schema/flat-union-clash-member.out
create mode 100644 tests/qapi-schema/flat-union-clash-type.err
create mode 100644 tests/qapi-schema/flat-union-clash-type.exit
create mode 100644 tests/qapi-schema/flat-union-clash-type.json
create mode 100644 tests/qapi-schema/flat-union-clash-type.out
create mode 100644 tests/qapi-schema/flat-union-empty.err
create mode 100644 tests/qapi-schema/flat-union-empty.exit
create mode 100644 tests/qapi-schema/flat-union-empty.json
create mode 100644 tests/qapi-schema/flat-union-empty.out
create mode 100644 tests/qapi-schema/struct-base-clash-base.err
create mode 100644 tests/qapi-schema/struct-base-clash-base.exit
create mode 100644 tests/qapi-schema/struct-base-clash-base.json
create mode 100644 tests/qapi-schema/struct-base-clash-base.out
create mode 100644 tests/qapi-schema/union-clash-branches.err
create mode 100644 tests/qapi-schema/union-clash-branches.exit
create mode 100644 tests/qapi-schema/union-clash-branches.json
create mode 100644 tests/qapi-schema/union-clash-branches.out
create mode 100644 tests/qapi-schema/union-clash-data.err
create mode 100644 tests/qapi-schema/union-clash-data.exit
create mode 100644 tests/qapi-schema/union-clash-data.json
create mode 100644 tests/qapi-schema/union-clash-data.out
create mode 100644 tests/qapi-schema/union-clash-type.err
create mode 100644 tests/qapi-schema/union-clash-type.exit
create mode 100644 tests/qapi-schema/union-clash-type.json
create mode 100644 tests/qapi-schema/union-clash-type.out
create mode 100644 tests/qapi-schema/union-empty.err
create mode 100644 tests/qapi-schema/union-empty.exit
create mode 100644 tests/qapi-schema/union-empty.json
create mode 100644 tests/qapi-schema/union-empty.out
--
2.4.3
