On Wed, 7 May 2014 09:53:42 +0200 Markus Armbruster <arm...@redhat.com> wrote:
> This is the sixth part, covering QAPI and its users. Luiz agreed to > take this through his tree. > > PATCH 01-08 are preparatory cleanups. > > PATCH 09-11 fix misuses of the visitor API in hand-written code. > Generated code uses the API correctly. > > PATCH 12 converts QAPI and its users to the common use of the error > API, purging error_is_set() along the way. > > v1 has a PATCH 13 that drops error_is_set(). This depends on all five > prior parts of the purge, of which only the first two have been > committed already. Luiz asked me to drop it from this series. > > My series conflicts with LluĂs's "qapi: Allow modularization of QAPI > schema files" and Amos's "qapi: fix coding style in generated code", > but the conflicts are trivial, and 3-way merge can take care of them. > > v2: > * Fix pasto in commit messages of PATCH 10+11 [Eric] > * Fix logic error in PATCH 12 [Eric] > * Update copyright notice in PATCH 12 > * Unbundle PATCH 13 Applied to the qmp branch, thanks. > > Markus Armbruster (12): > qapi: Update qapi-code-gen.txt example to match current code > qapi: Normalize marshalling's visitor initialization and cleanup > qapi: Remove unused Visitor callbacks start_handle(), end_handle() > qapi: Replace start_optional()/end_optional() by optional() > qapi-visit.py: Clean up confusing push_indent() / pop_indent() use > qapi: Clean up shadowing of parameters and locals in inner scopes > qapi-visit.py: Clean up a sloppy use of field prefix > qapi: Un-inline visit of implicit struct > hmp: Call visit_end_struct() after visit_start_struct() succeeds > hw: Don't call visit_end_struct() after visit_start_struct() fails > tests: Don't call visit_end_struct() after visit_start_struct() fails > qapi: Replace uncommon use of the error API by the common one > > docs/qapi-code-gen.txt | 165 ++++++++++++++--------- > hmp.c | 16 +-- > hw/timer/mc146818rtc.c | 41 +++++- > hw/virtio/virtio-balloon.c | 33 +++-- > include/qapi/visitor-impl.h | 8 +- > include/qapi/visitor.h | 5 +- > qapi/opts-visitor.c | 5 +- > qapi/qapi-visit-core.c | 259 > +++++++++++++++---------------------- > qapi/qmp-input-visitor.c | 6 +- > qapi/string-input-visitor.c | 6 +- > scripts/qapi-commands.py | 89 ++++++++----- > scripts/qapi-visit.py | 232 +++++++++++++++++++-------------- > tests/test-qmp-input-strict.c | 28 +++- > tests/test-qmp-input-visitor.c | 26 ++-- > tests/test-qmp-output-visitor.c | 28 +++- > tests/test-visitor-serialization.c | 26 +++- > 16 files changed, 558 insertions(+), 415 deletions(-) >