Pending prerequisite: Markus' qapi-next branch (which has my subset A patches): git://repo.or.cz/qemu/armbru.git qapi-next http://thread.gmane.org/gmane.comp.emulators.qemu/365827/focus=366351
Also available as a tag at this location: git fetch git://repo.or.cz/qemu/ericb.git qapi-cleanupv7b and I plan to eventually forcefully update my branch with the rest of the v5 series, at: http://repo.or.cz/qemu/ericb.git/shortlog/refs/heads/qapi v7 notes: Address comments, including a couple of new commits that made later patches a bit cleaner. Backport diff gets a bit confused by a couple of patch titles changing. 001/14:[0013] [FC] 'qapi: Use predicate callback to determine visit filtering' 002/14:[down] 'qapi: Prepare for errors during check()' 003/14:[down] 'qapi: Drop redundant alternate-good test' 004/14:[0026] [FC] 'qapi: Don't use info as witness of implicit object type' 005/14:[0032] [FC] 'qapi: Lazy creation of array types' 006/14:[0018] [FC] 'qapi: Create simple union type member earlier' 007/14:[down] 'qapi: Move union tag quirks into subclass' 008/14:[0039] [FC] 'qapi: Track location that created an implicit type' 009/14:[0190] [FC] 'qapi: Track owner of each object member' 010/14:[0023] [FC] 'qapi: Detect collisions in C member names' 011/14:[down] 'qapi: Move duplicate member checks to schema check()' 012/14:[down] 'qapi: Move duplicate enum value checks to schema check()' 013/14:[down] 'qapi: Add test for alternate branch 'kind' clash' 014/14:[----] [--] 'qapi: Detect base class loops' v6 notes: http://thread.gmane.org/gmane.comp.emulators.qemu/366417 This is patches 11-16 of my v5 series; it has grown a bit with splitting some patches and adding some others. I suspect that 12/12 on this series will be discarded, but am including it because it was split from v5 content. Not much review comments other than on the original 11/46, but there is enough churn due to rebasing that it's now easier to review this version than plowing through v5. Subset C (and more?) will come later. In v5: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg05410.html I _did_ rearrange patches to try and group related features: 1-2: Groundwork cleanups 3-5: Add more test cases 6-16: Front-end cleanups 17-18: Introspection output cleanups 19-20: 'alternate' type cleanups 21-29: qapi visitor cleanups 30-45: qapi-ify netdev_add 46: add qapi shorthand for flat unions Lots of fixes based on additional testing, and rebased to track other changes that happened in the meantime. The series is huge; I can split off smaller portions as requested. In v4: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg02580.html add some more clean up patches rebase to Markus' recent work pull in part of Zoltán's work to make netdev_add a flat union, further enhancing it to be introspectible I might be able to rearrange some of these patches, or separate it into smaller independent series, if requested; but I'm posting now to get review started. In v3: https://lists.gnu.org/archive/html/qemu-devel/2015-08/msg02059.html redo cleanup of dealloc of partial struct add patches to make all visit_type_*() avoid leaks on failure add patches to allow boxed command arguments and events In v2: https://lists.gnu.org/archive/html/qemu-devel/2015-08/msg00900.html rebase to Markus' v3 series rework how comments are emitted for fields inherited from base additional patches added for deleting colliding 'void *data' documentation updates to match code changes v1 was here: https://lists.gnu.org/archive/html/qemu-devel/2015-07/msg05266.html https://lists.gnu.org/archive/html/qemu-devel/2015-07/msg05325.html Eric Blake (14): qapi: Use predicate callback to determine visit filtering qapi: Prepare for errors during check() qapi: Drop redundant alternate-good test qapi: Don't use info as witness of implicit object type qapi: Lazy creation of array types qapi: Create simple union type member earlier qapi: Move union tag quirks into subclass qapi: Track location that created an implicit type qapi: Track owner of each object member qapi: Detect collisions in C member names qapi: Move duplicate member checks to schema check() qapi: Move duplicate enum value checks to schema check() qapi: Add test for alternate branch 'kind' clash qapi: Detect base class loops qapi-schema.json | 11 + scripts/qapi-commands.py | 8 +- scripts/qapi-introspect.py | 5 +- scripts/qapi-types.py | 31 +- scripts/qapi-visit.py | 34 +-- scripts/qapi.py | 321 +++++++++++++-------- tests/Makefile | 6 +- tests/qapi-schema/alternate-clash-members.err | 1 + ...ad-branch.exit => alternate-clash-members.exit} | 0 ...ate-clash.json => alternate-clash-members.json} | 0 ...-bad-branch.out => alternate-clash-members.out} | 0 tests/qapi-schema/alternate-clash-type.err | 1 + ...ernate-clash.exit => alternate-clash-type.exit} | 0 tests/qapi-schema/alternate-clash-type.json | 10 + ...alternate-good.err => alternate-clash-type.out} | 0 tests/qapi-schema/alternate-clash.err | 1 - tests/qapi-schema/alternate-good.exit | 1 - tests/qapi-schema/alternate-good.json | 9 - tests/qapi-schema/alternate-good.out | 10 - tests/qapi-schema/args-member-array.out | 4 +- tests/qapi-schema/args-name-clash.err | 1 + tests/qapi-schema/args-name-clash.exit | 2 +- tests/qapi-schema/args-name-clash.json | 6 +- tests/qapi-schema/args-name-clash.out | 6 - tests/qapi-schema/base-cycle.err | 1 + tests/qapi-schema/base-cycle.exit | 1 + tests/qapi-schema/base-cycle.json | 3 + .../{alternate-clash.out => base-cycle.out} | 0 tests/qapi-schema/enum-clash-member.err | 2 +- tests/qapi-schema/enum-max-member.err | 2 +- tests/qapi-schema/flat-union-clash-branch.err | 1 + tests/qapi-schema/flat-union-clash-branch.exit | 2 +- tests/qapi-schema/flat-union-clash-branch.json | 9 +- tests/qapi-schema/flat-union-clash-branch.out | 14 - tests/qapi-schema/flat-union-clash-member.err | 2 +- tests/qapi-schema/flat-union-clash-type.err | 2 +- tests/qapi-schema/ident-with-escape.out | 4 +- tests/qapi-schema/qapi-schema-test.json | 4 + tests/qapi-schema/qapi-schema-test.out | 91 +++--- tests/qapi-schema/struct-base-clash-deep.err | 2 +- tests/qapi-schema/struct-base-clash.err | 2 +- tests/qapi-schema/union-bad-branch.err | 1 - tests/qapi-schema/union-bad-branch.json | 8 - tests/qapi-schema/union-clash-branches.err | 2 +- tests/qapi-schema/union-clash-data.out | 4 +- tests/qapi-schema/union-clash-type.err | 2 +- tests/qapi-schema/union-max.err | 2 +- 47 files changed, 341 insertions(+), 288 deletions(-) create mode 100644 tests/qapi-schema/alternate-clash-members.err rename tests/qapi-schema/{union-bad-branch.exit => alternate-clash-members.exit} (100%) rename tests/qapi-schema/{alternate-clash.json => alternate-clash-members.json} (100%) rename tests/qapi-schema/{union-bad-branch.out => alternate-clash-members.out} (100%) create mode 100644 tests/qapi-schema/alternate-clash-type.err rename tests/qapi-schema/{alternate-clash.exit => alternate-clash-type.exit} (100%) create mode 100644 tests/qapi-schema/alternate-clash-type.json rename tests/qapi-schema/{alternate-good.err => alternate-clash-type.out} (100%) delete mode 100644 tests/qapi-schema/alternate-clash.err delete mode 100644 tests/qapi-schema/alternate-good.exit delete mode 100644 tests/qapi-schema/alternate-good.json delete mode 100644 tests/qapi-schema/alternate-good.out create mode 100644 tests/qapi-schema/base-cycle.err create mode 100644 tests/qapi-schema/base-cycle.exit create mode 100644 tests/qapi-schema/base-cycle.json rename tests/qapi-schema/{alternate-clash.out => base-cycle.out} (100%) delete mode 100644 tests/qapi-schema/union-bad-branch.err delete mode 100644 tests/qapi-schema/union-bad-branch.json -- 2.4.3
