Failed in applying to current master (
apply log)
Maintainers: "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Markus Armbruster <armbru@redhat.com>, Michael Roth <michael.roth@amd.com>, Peter Maydell <peter.maydell@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Eric Blake <eblake@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Stefan Berger <stefanb@linux.vnet.ibm.com>, Gerd Hoffmann <kraxel@redhat.com>, Lukas Straub <lukasstraub2@web.de>, Konstantin Kostiuk <kkostiuk@redhat.com>
MAINTAINERS | 2 +
docs/devel/qapi-code-gen.rst | 14 ++++--
docs/sphinx/qapidoc.py | 6 ---
qapi/block-core.json | 26 ++++++++--
qapi/block-export.json | 2 +
qapi/char.json | 28 +++++++++++
qapi/common.json | 11 -----
qapi/crypto.json | 2 +
qapi/dump.json | 2 +-
qapi/machine.json | 14 ++++++
qapi/migration.json | 52 ++++++++++---------
qapi/misc.json | 12 +++--
qapi/net.json | 12 ++++-
qapi/pragma.json | 66 +++++++++++++++++++++++++
qapi/qdev.json | 12 ++---
qapi/sockets.json | 48 +++++++++++++-----
qapi/stats.json | 2 +
qapi/tpm.json | 4 ++
qapi/transaction.json | 2 +
qapi/ui.json | 14 ++++++
qapi/yank.json | 4 +-
qga/qapi-schema.json | 58 ++++++++++++++--------
include/hw/virtio/vhost-vsock-common.h | 1 +
include/net/filter.h | 2 +-
chardev/char-socket.c | 2 +-
util/qemu-sockets.c | 3 +-
scripts/qapi/parser.py | 7 ++-
scripts/qapi/source.py | 2 +
tests/qapi-schema/doc-bad-alternate-member.json | 2 +
tests/qapi-schema/doc-good.json | 14 +++---
tests/qapi-schema/doc-good.out | 2 +-
31 files changed, 322 insertions(+), 106 deletions(-)