[Qemu-devel] [PATCH v14 00/15] qapi member collision (post-introspection cleanups, subset D)

[Eric Blake]

Pending prerequisites:
+ Markus' "typedefs: Put them back into alphabetical order"
https://lists.gnu.org/archive/html/qemu-devel/2015-11/msg04417.html
which is now queued in qemu-trivial:
https://lists.gnu.org/archive/html/qemu-devel/2015-11/msg06297.html
+ Markus' qapi-next branch
http://repo.or.cz/qemu/armbru.git/shortlog/refs/heads/qapi-next

Also available as a tag at this location:
git fetch git://repo.or.cz/qemu/ericb.git qapi-cleanupv14d

and will soon be part of my branch with the rest of the v5 series, at:
http://repo.or.cz/qemu/ericb.git/shortlog/refs/heads/qapi

v14 notes:
Incorporate review comments from Markus, including one new patch.
Overall the changes are rather self-contained (more work in adding
justifications to commit messages or strategic code comments than
in actually modifying design), so we may have reached convergence
on this part of the series.

001/15:[0028] [FC] 'qobject: Simplify QObject'
002/15:[----] [-C] 'qobject: Rename qtype_code to QType'
003/15:[0009] [FC] 'qapi: Convert QType into QAPI built-in enum type'
004/15:[0002] [FC] 'qapi: Simplify visiting of alternate types'
005/15:[down] 'qapi-types: Drop unnedeed ._fwdefn'
006/15:[----] [--] 'qapi: Inline _make_implicit_tag()'
007/15:[----] [--] 'qapi: Fix alternates that accept 'number' but not 'int''
008/15:[----] [--] 'qapi: Simplify visits of optional fields'
009/15:[----] [--] 'qapi: Shorter visits of optional fields'
010/15:[----] [--] 'qapi: Prepare new QAPISchemaMember base class'
011/15:[0031] [FC] 'qapi: Track enum values by QAPISchemaMember, not string'
012/15:[0012] [FC] 'qapi: Populate info['name'] for each entity'
013/15:[0020] [FC] 'qapi: Enforce (or whitelist) case conventions on qapi 
members'
014/15:[----] [--] 'qapi: Move duplicate collision checks to schema check()'
015/15:[----] [--] 'qapi: Detect base class loops'

v13 notes:
https://lists.gnu.org/archive/html/qemu-devel/2015-11/msg04732.html
1-26 of v12 were taken into qapi-next. 27 and 34 are dropped,
replaced by new patches for whitelisting exceptions to the
lower-case member name rule.  Pick up the tail end of v11 that
was dropped in v12 (although 26/28 and 27/28 of v11 are merged
as a single 13/14 here).

v12 notes:
https://lists.gnu.org/archive/html/qemu-devel/2015-11/msg04033.html
Delay 26-28 to a later subset, and instead add lots of new prereq
patches that tackle some cleanups that make case-insensitive
collision detection easier.  Series is now slated for 2.6.

v11 notes:
https://lists.gnu.org/archive/html/qemu-devel/2015-11/msg02563.html
First half of v10 subset C has been applied, so consolidate the last
half of that along with all of subset D (which was at v9) into one
group.  Address list reviews, in particular, add a new patch 21 that
makes alternate layouts a lot nicer by making qtype_code a builtin
qapi type; and new patches 18-19 that try to reduce confusion on
the use of camel_to_upper() in c_enum_const().

Probably too late to get these into 2.5, in which case 17/28 will need
tweaks to call out 2.6.

v10 and earlier - look in the mail archives :)

Eric Blake (15):
  qobject: Simplify QObject
  qobject: Rename qtype_code to QType
  qapi: Convert QType into QAPI built-in enum type
  qapi: Simplify visiting of alternate types
  qapi-types: Drop unnedeed ._fwdefn
  qapi: Inline _make_implicit_tag()
  qapi: Fix alternates that accept 'number' but not 'int'
  qapi: Simplify visits of optional fields
  qapi: Shorter visits of optional fields
  qapi: Prepare new QAPISchemaMember base class
  qapi: Track enum values by QAPISchemaMember, not string
  qapi: Populate info['name'] for each entity
  qapi: Enforce (or whitelist) case conventions on qapi members
  qapi: Move duplicate collision checks to schema check()
  qapi: Detect base class loops

 block/qapi.c                                       |   4 +-
 docs/qapi-code-gen.txt                             |   4 +-
 include/hw/qdev-core.h                             |   2 +-
 include/qapi/qmp/qbool.h                           |   1 +
 include/qapi/qmp/qdict.h                           |   1 +
 include/qapi/qmp/qfloat.h                          |   1 +
 include/qapi/qmp/qint.h                            |   1 +
 include/qapi/qmp/qlist.h                           |   1 +
 include/qapi/qmp/qobject.h                         |  50 +++---
 include/qapi/qmp/qstring.h                         |   1 +
 include/qapi/visitor-impl.h                        |   8 +-
 include/qapi/visitor.h                             |  19 ++-
 include/qemu/typedefs.h                            |   1 +
 qapi/opts-visitor.c                                |   2 +-
 qapi/qapi-visit-core.c                             |  10 +-
 qapi/qmp-input-visitor.c                           |  10 +-
 qapi/string-input-visitor.c                        |   3 +-
 qobject/Makefile.objs                              |   2 +-
 qobject/qbool.c                                    |  11 +-
 qobject/qdict.c                                    |  14 +-
 qobject/qfloat.c                                   |  11 +-
 qobject/qint.c                                     |  11 +-
 qobject/qlist.c                                    |  11 +-
 qobject/qnull.c                                    |  12 +-
 qobject/qobject.c                                  |  34 ++++
 qobject/qstring.c                                  |  11 +-
 scripts/qapi-types.py                              |  52 ++----
 scripts/qapi-visit.py                              |  31 +++-
 scripts/qapi.py                                    | 180 ++++++++++-----------
 tests/Makefile                                     |   6 +-
 tests/qapi-schema/alternate-clash.err              |   2 +-
 tests/qapi-schema/alternate-empty.out              |   3 +-
 tests/qapi-schema/args-member-case.err             |   1 +
 ...union-bad-branch.exit => args-member-case.exit} |   0
 tests/qapi-schema/args-member-case.json            |   3 +
 .../{union-bad-branch.out => args-member-case.out} |   0
 tests/qapi-schema/base-cycle-direct.err            |   1 +
 tests/qapi-schema/base-cycle-direct.exit           |   1 +
 tests/qapi-schema/base-cycle-direct.json           |   2 +
 tests/qapi-schema/base-cycle-direct.out            |   0
 tests/qapi-schema/base-cycle-indirect.err          |   1 +
 tests/qapi-schema/base-cycle-indirect.exit         |   1 +
 tests/qapi-schema/base-cycle-indirect.json         |   3 +
 tests/qapi-schema/base-cycle-indirect.out          |   0
 tests/qapi-schema/comments.out                     |   2 +
 tests/qapi-schema/empty.out                        |   2 +
 tests/qapi-schema/enum-clash-member.err            |   2 +-
 tests/qapi-schema/enum-clash-member.json           |   2 +-
 tests/qapi-schema/enum-member-case.err             |   1 +
 tests/qapi-schema/enum-member-case.exit            |   1 +
 tests/qapi-schema/enum-member-case.json            |   3 +
 tests/qapi-schema/enum-member-case.out             |   0
 tests/qapi-schema/event-case.out                   |   2 +
 tests/qapi-schema/flat-union-clash-member.err      |   2 +-
 tests/qapi-schema/flat-union-empty.out             |   2 +
 tests/qapi-schema/ident-with-escape.out            |   2 +
 tests/qapi-schema/include-relpath.out              |   2 +
 tests/qapi-schema/include-repetition.out           |   2 +
 tests/qapi-schema/include-simple.out               |   2 +
 tests/qapi-schema/indented-expr.out                |   2 +
 tests/qapi-schema/qapi-schema-test.out             |  10 +-
 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-branch-case.err            |   1 +
 tests/qapi-schema/union-branch-case.exit           |   1 +
 tests/qapi-schema/union-branch-case.json           |   3 +
 tests/qapi-schema/union-branch-case.out            |   0
 tests/qapi-schema/union-clash-branches.err         |   2 +-
 tests/qapi-schema/union-clash-branches.json        |   2 +-
 tests/qapi-schema/union-clash-data.out             |   2 +
 tests/qapi-schema/union-empty.out                  |   2 +
 tests/test-qmp-input-visitor.c                     |  29 ++--
 tests/test-qmp-output-visitor.c                    |   4 +-
 75 files changed, 312 insertions(+), 309 deletions(-)
 create mode 100644 qobject/qobject.c
 create mode 100644 tests/qapi-schema/args-member-case.err
 rename tests/qapi-schema/{union-bad-branch.exit => args-member-case.exit} 
(100%)
 create mode 100644 tests/qapi-schema/args-member-case.json
 rename tests/qapi-schema/{union-bad-branch.out => args-member-case.out} (100%)
 create mode 100644 tests/qapi-schema/base-cycle-direct.err
 create mode 100644 tests/qapi-schema/base-cycle-direct.exit
 create mode 100644 tests/qapi-schema/base-cycle-direct.json
 create mode 100644 tests/qapi-schema/base-cycle-direct.out
 create mode 100644 tests/qapi-schema/base-cycle-indirect.err
 create mode 100644 tests/qapi-schema/base-cycle-indirect.exit
 create mode 100644 tests/qapi-schema/base-cycle-indirect.json
 create mode 100644 tests/qapi-schema/base-cycle-indirect.out
 create mode 100644 tests/qapi-schema/enum-member-case.err
 create mode 100644 tests/qapi-schema/enum-member-case.exit
 create mode 100644 tests/qapi-schema/enum-member-case.json
 create mode 100644 tests/qapi-schema/enum-member-case.out
 delete mode 100644 tests/qapi-schema/union-bad-branch.err
 delete mode 100644 tests/qapi-schema/union-bad-branch.json
 create mode 100644 tests/qapi-schema/union-branch-case.err
 create mode 100644 tests/qapi-schema/union-branch-case.exit
 create mode 100644 tests/qapi-schema/union-branch-case.json
 create mode 100644 tests/qapi-schema/union-branch-case.out

-- 
2.4.3