Pending prerequisite: Markus' qapi-next branch git://repo.or.cz/qemu/armbru.git qapi-next https://lists.gnu.org/archive/html/qemu-devel/2015-10/msg06417.html
Also available as a tag at this location: git fetch git://repo.or.cz/qemu/ericb.git qapi-cleanupv8c as well as part of my branch with the rest of the v5 series, at: http://repo.or.cz/qemu/ericb.git/shortlog/refs/heads/qapi v8 notes: Minor changes when rebasing to latest, improved commit messages in a few places, plus the addition of a few new patches. Markus started reviewing v7, but hadn't gotten very far. 001/17:[----] [--] 'qapi: Use generated TestStruct machinery in tests' 002/17:[----] [--] 'qapi: Strengthen test of TestStructList' 003/17:[----] [--] 'qapi: Provide nicer array names in introspection' 004/17:[----] [--] 'qapi-introspect: Guarantee particular sorting' 005/17:[down] 'qapi: Track simple union tag in object.local_members' 006/17:[down] 'qapi-types: Consolidate gen_struct() and gen_union()' 007/17:[0007] [FC] 'qapi: Rework collision assertions' 008/17:[down] 'qapi: Remove outdated tests related to QMP/branch collisions' 009/17:[down] 'qapi: Add positive tests to qapi-schema-test' 010/17:[----] [-C] 'qapi: Simplify visiting of alternate types' 011/17:[----] [--] 'qapi: Fix alternates that accept 'number' but not 'int'' 012/17:[----] [--] 'qapi: Remove dead visitor code' 013/17:[----] [--] 'qapi: Plug leaks in test-qmp-*' 014/17:[----] [-C] 'qapi: Simplify error testing in test-qmp-*' 015/17:[----] [--] 'qapi: Test failure in middle of array parse' 016/17:[----] [--] 'qapi: More tests of input arrays' 017/17:[----] [--] 'qapi: Simplify visits of optional fields' v7 notes: https://lists.gnu.org/archive/html/qemu-devel/2015-10/msg04112.html Patches 1-3 of the previous round have moved to subset B; patch 7 is gone, and a couple of new patches are present in this round. The latest version of subset B made it much easier to reason about collision detection (namely, tag values can't collide with QMP values thanks to a named rather than anonymous union in the C type), and I like how things turned out. I suspect the hardest part of the review will be patches 5/14 and 7/14, although none of this has really had much review in any earlier versions. v6 notes: https://lists.gnu.org/archive/html/qemu-devel/2015-10/msg01980.html Add some patches and rebase onto work on subset B. Rearrange some patches from v5 (this set includes 17-20, 23, 25-27). Backport diff gets a bit confused by one patch title changing. Not much direct review comments, although some of the changes here are updated based on comments made on other patches in the v5 series. Subset D (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 (17): qapi: Use generated TestStruct machinery in tests qapi: Strengthen test of TestStructList qapi: Provide nicer array names in introspection qapi-introspect: Guarantee particular sorting qapi: Track simple union tag in object.local_members qapi-types: Consolidate gen_struct() and gen_union() qapi: Rework collision assertions qapi: Remove outdated tests related to QMP/branch collisions qapi: Add positive tests to qapi-schema-test qapi: Simplify visiting of alternate types qapi: Fix alternates that accept 'number' but not 'int' qapi: Remove dead visitor code qapi: Plug leaks in test-qmp-* qapi: Simplify error testing in test-qmp-* qapi: Test failure in middle of array parse qapi: More tests of input arrays qapi: Simplify visits of optional fields docs/qapi-code-gen.txt | 31 ++- include/qapi/visitor-impl.h | 27 ++- include/qapi/visitor.h | 22 +- qapi/introspect.json | 22 +- qapi/opts-visitor.c | 2 +- qapi/qapi-visit-core.c | 141 +++++-------- qapi/qmp-input-visitor.c | 11 +- qapi/string-input-visitor.c | 3 +- scripts/qapi-introspect.py | 17 +- scripts/qapi-types.py | 70 ++----- scripts/qapi-visit.py | 27 ++- scripts/qapi.py | 116 ++++++----- tests/Makefile | 3 - tests/qapi-schema/alternate-empty.out | 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-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/qapi-schema-test.json | 26 ++- tests/qapi-schema/qapi-schema-test.out | 46 ++++- tests/qapi-schema/union-clash-data.out | 1 + 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.out | 1 + tests/test-qmp-input-strict.c | 108 +++------- tests/test-qmp-input-visitor.c | 268 +++++++++++-------------- tests/test-qmp-output-visitor.c | 153 ++++---------- tests/test-visitor-serialization.c | 76 ++----- 34 files changed, 503 insertions(+), 729 deletions(-) delete mode 100644 tests/qapi-schema/flat-union-clash-branch.err delete mode 100644 tests/qapi-schema/flat-union-clash-branch.exit delete mode 100644 tests/qapi-schema/flat-union-clash-branch.json delete mode 100644 tests/qapi-schema/flat-union-clash-branch.out delete mode 100644 tests/qapi-schema/flat-union-clash-type.err delete mode 100644 tests/qapi-schema/flat-union-clash-type.exit delete mode 100644 tests/qapi-schema/flat-union-clash-type.json delete mode 100644 tests/qapi-schema/flat-union-clash-type.out delete mode 100644 tests/qapi-schema/union-clash-type.err delete mode 100644 tests/qapi-schema/union-clash-type.exit delete mode 100644 tests/qapi-schema/union-clash-type.json delete mode 100644 tests/qapi-schema/union-clash-type.out -- 2.4.3
