The following changes since commit b150cb8f67bf491a49a1cb1c7da151eeacbdbcc9:
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
(2020-09-29 13:18:54 +0100)
are available in the Git repository at:
git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2020-09-29
for you to fetch changes up to 7cd77fb02b9a2117a56fed172f09a1820fcd6b0b:
Remove texinfo dependency from docker and CI configs (2020-09-29 17:55:39
+0200)
----------------------------------------------------------------
QAPI patches patches for 2020-09-29
----------------------------------------------------------------
Peter Maydell (21):
qapi: Fix doc comment indentation again
qapi/block.json: Add newline after "Example:" for
block-latency-histogram-set
tests/qapi/doc-good.json: Prepare for qapi-doc Sphinx extension
scripts/qapi: Move doc-comment whitespace stripping to doc.py
scripts/qapi/parser.py: improve doc comment indent handling
qapi/machine.json: Escape a literal '*' in doc comment
docs/sphinx: Add new qapi-doc Sphinx extension
docs/interop: Convert qemu-ga-ref to rST
docs/interop: Convert qemu-qmp-ref to rST
qapi: Use rST markup for literal blocks
qga/qapi-schema.json: Add some headings
tests/qapi-schema: Convert doc-good.json to rST-style strong/emphasis
meson.build: Move SPHINX_ARGS to top level meson.build file
meson.build: Make manuals depend on source to Sphinx extensions
tests/qapi-schema: Add test of the rST QAPI doc-comment output
scripts/qapi: Remove texinfo generation support
docs/devel/qapi-code-gen.txt: Update to new rST backend conventions
scripts/texi2pod: Delete unused script
Remove Texinfo related line from git.orderfile
configure: Drop texinfo requirement
Remove texinfo dependency from docker and CI configs
Philippe Mathieu-Daudé (8):
qapi: Restrict LostTickPolicy enum to machine code
qapi: Correct balloon documentation
qapi: Restrict balloon-related commands to machine code
qapi: Restrict query-vm-generation-id command to machine code
qapi: Restrict query-uuid command to machine code
qapi: Restrict device memory commands to machine code
qapi: Extract ACPI commands to 'acpi.json'
qapi: Extract PCI commands to 'pci.json'
docs/conf.py | 6 +-
docs/devel/qapi-code-gen.txt | 106 ++--
docs/index.html.in | 2 -
docs/interop/conf.py | 4 +
docs/interop/index.rst | 2 +
docs/interop/qemu-ga-ref.rst | 13 +
docs/interop/qemu-ga-ref.texi | 80 ---
docs/interop/qemu-qmp-ref.rst | 13 +
docs/interop/qemu-qmp-ref.texi | 80 ---
docs/meson.build | 12 +-
docs/sphinx/qapidoc.py | 549 +++++++++++++++++++
tests/qapi-schema/doc-good.rst | 5 +
configure | 12 +-
Makefile | 2 +-
meson.build | 103 +---
qapi/acpi.json | 141 +++++
qapi/block-core.json | 20 +-
qapi/block.json | 12 +-
qapi/machine.json | 392 +++++++++++++-
qapi/migration.json | 108 ++--
qapi/misc.json | 820 -----------------------------
qapi/pci.json | 316 +++++++++++
qapi/qapi-schema.json | 8 +-
qga/qapi-schema.json | 8 +-
include/hw/acpi/acpi_dev_interface.h | 2 +-
include/hw/mem/memory-device.h | 2 +-
include/hw/rtc/mc146818rtc.h | 2 +-
include/hw/virtio/virtio-pmem.h | 2 +-
include/sysemu/balloon.h | 2 +-
block/iscsi.c | 2 +-
hw/acpi/core.c | 2 +-
hw/acpi/cpu.c | 2 +-
hw/acpi/memory_hotplug.c | 3 +-
hw/acpi/vmgenid.c | 2 +-
hw/core/qdev-properties.c | 1 +
hw/i386/kvm/i8254.c | 2 +-
hw/pci/pci-stub.c | 2 +-
hw/pci/pci.c | 2 +-
hw/virtio/virtio-balloon.c | 2 +-
hw/virtio/virtio-mem-pci.c | 1 +
monitor/hmp-cmds.c | 2 +
monitor/qmp-cmds.c | 1 +
softmmu/balloon.c | 2 +-
stubs/uuid.c | 2 +-
stubs/vmgenid.c | 2 +-
.travis.yml | 1 -
MAINTAINERS | 6 +-
qapi/meson.build | 6 +-
qga/meson.build | 3 +-
scripts/checkpatch.pl | 2 +-
scripts/coverity-scan/coverity-scan.docker | 1 -
scripts/git.orderfile | 1 -
scripts/qapi-gen.py | 2 -
scripts/qapi/doc.py | 301 -----------
scripts/qapi/gen.py | 7 -
scripts/qapi/parser.py | 105 +++-
scripts/texi2pod.pl | 536 -------------------
storage-daemon/qapi/meson.build | 2 +-
tests/docker/dockerfiles/debian10.docker | 1 -
tests/docker/dockerfiles/fedora.docker | 1 -
tests/docker/dockerfiles/ubuntu.docker | 1 -
tests/docker/dockerfiles/ubuntu1804.docker | 1 -
tests/docker/dockerfiles/ubuntu2004.docker | 1 -
tests/qapi-schema/doc-bad-indent.err | 1 +
tests/qapi-schema/doc-bad-indent.json | 8 +
tests/qapi-schema/doc-bad-indent.out | 0
tests/qapi-schema/doc-good.json | 27 +-
tests/qapi-schema/doc-good.out | 24 +-
tests/qapi-schema/doc-good.texi | 319 -----------
tests/qapi-schema/doc-good.txt | 288 ++++++++++
tests/qapi-schema/meson.build | 63 ++-
71 files changed, 2113 insertions(+), 2449 deletions(-)
create mode 100644 docs/interop/qemu-ga-ref.rst
delete mode 100644 docs/interop/qemu-ga-ref.texi
create mode 100644 docs/interop/qemu-qmp-ref.rst
delete mode 100644 docs/interop/qemu-qmp-ref.texi
create mode 100644 docs/sphinx/qapidoc.py
create mode 100644 tests/qapi-schema/doc-good.rst
create mode 100644 qapi/acpi.json
create mode 100644 qapi/pci.json
delete mode 100644 scripts/qapi/doc.py
delete mode 100755 scripts/texi2pod.pl
create mode 100644 tests/qapi-schema/doc-bad-indent.err
create mode 100644 tests/qapi-schema/doc-bad-indent.json
create mode 100644 tests/qapi-schema/doc-bad-indent.out
delete mode 100644 tests/qapi-schema/doc-good.texi
create mode 100644 tests/qapi-schema/doc-good.txt
--
2.26.2
