Failed in applying to current master (
apply log)
MAINTAINERS | 3 +-
Makefile | 6 +--
block/qcow2.c | 1 -
cpus.c | 2 -
docs/devel/qapi-code-gen.txt | 8 ++--
qapi/block-core.json | 52 ++--------------------
qapi/crypto.json | 13 +-----
qapi/misc.json | 46 +------------------
qapi/net.json | 12 -----
qapi/ui.json | 19 +-------
qobject/block-qdict.c | 19 ++++++--
scripts/qapi/common.py | 32 ++++++++-----
scripts/qapi/events.py | 5 ++-
scripts/qapi/introspect.py | 5 +--
scripts/qapi/types.py | 2 +
scripts/qapi/visit.py | 21 ++++++---
tests/Makefile.include | 7 ++-
tests/check-block-qdict.c | 33 ++++++++++++++
tests/qapi-schema/flat-union-incomplete-branch.err | 1 -
.../qapi-schema/flat-union-incomplete-branch.exit | 1 -
.../qapi-schema/flat-union-incomplete-branch.json | 9 ----
tests/qapi-schema/flat-union-incomplete-branch.out | 0
tests/qapi-schema/qapi-schema-test.json | 6 ++-
tests/qapi-schema/qapi-schema-test.out | 3 +-
24 files changed, 116 insertions(+), 190 deletions(-)
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.json
delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.out