Failed in applying to current master (
apply log)
docs/conf.py | 7 +
docs/devel/qapi-domain.rst | 70 +++++--
docs/interop/qemu-ga-ref.rst | 2 +
docs/interop/qemu-qmp-ref.rst | 1 +
docs/interop/qemu-storage-daemon-qmp-ref.rst | 2 +
docs/sphinx/qapi_domain.py | 297 +++++++++++++++++++--------
docs/sphinx/qapidoc.py | 12 ++
qapi/block-core.json | 28 ++-
qapi/qapi-schema.json | 2 +-
qga/qapi-schema.json | 3 +
storage-daemon/qapi/qapi-schema.json | 8 +
11 files changed, 315 insertions(+), 117 deletions(-)