Eric Blake <ebl...@redhat.com> writes: > On Mon, Sep 13, 2021 at 02:39:31PM +0200, Markus Armbruster wrote: >> Simple unions predate flat unions. Having both complicates the QAPI >> schema language and the QAPI generator. We haven't been using simple >> unions in new code for a long time, because they are less flexible and >> somewhat awkward on the wire. >> >> The previous commits eliminated simple union from the tree. Now drop >> them from the QAPI schema language entirely, and update mentions of >> "flat union" to just "union". >> >> Signed-off-by: Markus Armbruster <arm...@redhat.com> >> --- >> docs/devel/qapi-code-gen.rst | 125 ++++-------------- >> scripts/qapi/expr.py | 21 +-- >> scripts/qapi/schema.py | 101 +++----------- >> .../qapi-schema/flat-union-array-branch.json | 2 +- >> tests/qapi-schema/flat-union-empty.json | 2 +- >> tests/qapi-schema/flat-union-int-branch.json | 2 +- >> tests/qapi-schema/flat-union-no-base.err | 2 +- >> tests/qapi-schema/flat-union-no-base.json | 2 +- >> tests/qapi-schema/qapi-schema-test.json | 2 +- >> tests/qapi-schema/reserved-member-u.json | 2 +- >> tests/qapi-schema/union-base-empty.json | 2 +- >> .../union-base-no-discriminator.err | 2 +- >> .../union-base-no-discriminator.json | 2 +- >> 13 files changed, 62 insertions(+), 205 deletions(-) > > Whee! What a fun ride!
3-2-1-gone! And good riddance :) > Reviewed-by: Eric Blake <ebl...@redhat.com> Thank you for your quick review!