Failed in applying to current master (
apply log)
Maintainers: Markus Armbruster <armbru@redhat.com>, Michael Roth <michael.roth@amd.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Eric Blake <eblake@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Jason Wang <jasowang@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Stefan Berger <stefanb@linux.vnet.ibm.com>, Gerd Hoffmann <kraxel@redhat.com>, Lukas Straub <lukasstraub2@web.de>, Konstantin Kostiuk <kkostiuk@redhat.com>
docs/devel/qapi-code-gen.rst | 6 +-
docs/devel/writing-monitor-commands.rst | 496 ++++++++++++-----------------
qapi/block-core.json | 74 ++---
qapi/block-export.json | 23 +-
qapi/block.json | 10 +-
qapi/char.json | 6 -
qapi/dump.json | 2 -
qapi/machine-target.json | 37 ++-
qapi/machine.json | 19 +-
qapi/migration.json | 26 --
qapi/misc-target.json | 3 -
qapi/misc.json | 25 +-
qapi/net.json | 17 +-
qapi/qdev.json | 3 +-
qapi/qom.json | 6 +-
qapi/run-state.json | 5 +-
qapi/tpm.json | 2 -
qapi/transaction.json | 5 +-
qapi/ui.json | 17 +-
qapi/yank.json | 5 +-
qga/qapi-schema.json | 72 ++---
include/qapi/type-helpers.h | 8 +
include/qapi/util.h | 13 +
migration/exec.c | 57 +---
qapi/qapi-type-helpers.c | 14 +
scripts/qapi/parser.py | 50 ++-
tests/qapi-schema/doc-good.json | 2 +
tests/qapi-schema/doc-good.out | 2 +
tests/qapi-schema/doc-good.txt | 6 +
tests/qapi-schema/doc-invalid-return.err | 2 +-
tests/qapi-schema/doc-invalid-return2.err | 1 +
tests/qapi-schema/doc-invalid-return2.json | 7 +
tests/qapi-schema/doc-invalid-return2.out | 0
tests/qapi-schema/meson.build | 1 +
34 files changed, 430 insertions(+), 592 deletions(-)
create mode 100644 tests/qapi-schema/doc-invalid-return2.err
create mode 100644 tests/qapi-schema/doc-invalid-return2.json
create mode 100644 tests/qapi-schema/doc-invalid-return2.out