Failed in applying to current master (
apply log)
docs/devel/qapi-code-gen.rst | 3 +-
docs/interop/index.rst | 1 +
docs/interop/qmp-intro.txt | 88 -------
docs/interop/{qmp-spec.txt => qmp-spec.rst} | 337 ++++++++++++++------------
qapi/control.json | 4 +-
qapi/qapi-schema.json | 3 +-
qobject/json-lexer.c | 2 +-
python/qemu/qmp/models.py | 8 +-
python/qemu/qmp/qmp_client.py | 4 +-
qemu-options.hx | 28 ++-
scripts/qapi/parser.py | 4 +-
tests/qapi-schema/doc-interleaved-section.err | 2 +-
12 files changed, 224 insertions(+), 260 deletions(-)
delete mode 100644 docs/interop/qmp-intro.txt
rename docs/interop/{qmp-spec.txt => qmp-spec.rst} (56%)