since v2: remarks addressed: - qapi-code-gen.txt comment added - negative testcase (which became positive) is removed, verification added to qapi-schema-test
Anton Nefedov (2): qapi: allow empty branches in flat unions qapi: remove empty flat union branches and types docs/devel/qapi-code-gen.txt | 8 ++-- qapi/block-core.json | 55 ++-------------------- qapi/crypto.json | 13 +---- qapi/misc.json | 46 +----------------- qapi/net.json | 12 ----- qapi/ui.json | 19 +------- .../qapi-schema/flat-union-incomplete-branch.json | 9 ---- tests/qapi-schema/qapi-schema-test.json | 4 +- block/qcow2.c | 1 - cpus.c | 2 - scripts/qapi/common.py | 11 ++--- scripts/qapi/types.py | 4 +- scripts/qapi/visit.py | 17 +++++-- tests/Makefile.include | 1 - tests/qapi-schema/flat-union-incomplete-branch.err | 1 - .../qapi-schema/flat-union-incomplete-branch.exit | 1 - tests/qapi-schema/flat-union-incomplete-branch.out | 0 tests/qapi-schema/qapi-schema-test.out | 3 +- 18 files changed, 37 insertions(+), 170 deletions(-) delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.json delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.err delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.exit delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.out -- 2.7.4
