[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 26/30] docs/interop: Convert qemu-qmp-ref to rST
From: |
Peter Maydell |
Subject: |
Re: [PATCH v2 26/30] docs/interop: Convert qemu-qmp-ref to rST |
Date: |
Mon, 17 Feb 2020 15:10:43 +0000 |
On Thu, 13 Feb 2020 at 17:57, Peter Maydell <address@hidden> wrote:
>
> Convert qemu-qmp-ref to rST format. This includes dropping
> the plain-text, pdf and info format outputs for this document;
> as with all our other Sphinx-based documentation, we provide
> HTML and manpage only.
>
> The qemu-qmp-ref.rst is somewhat more stripped down than
> the .texi was, because we do not (currently) attempt to
> generate indexes for the commands, events and data types
> being documented.
>
> Again, we drop the direct link from index.html.in now that
> the QMP ref is part of the interop manual.
>
> Signed-off-by: Peter Maydell <address@hidden>
This patch is missing this fixup chunk:
diff --git a/Makefile b/Makefile
index 687a17dc0cb..8b719e10a85 100644
--- a/Makefile
+++ b/Makefile
@@ -1046,7 +1046,8 @@ $(MANUAL_BUILDDIR)/system/index.html: $(call
manual-deps,system)
$(call define-manpage-rule,interop,\
qemu-ga.8 qemu-ga-ref.7 \
- qemu-img.1 qemu-nbd.8 qemu-trace-stap.1\
+ qemu-img.1 qemu-nbd.8 \
+ qemu-qmp-ref.7 qemu-trace-stap.1 \
virtiofsd.1 virtfs-proxy-helper.1,\
$(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/qga/qapi-schema.json \
$(qapi-modules) $(qapi-py))
which tells Make how to actually build qemu-qmp-ref.7.
Without this you get build failures doing a build from
clean. (I think I must have accidentally lost this bit
during a rebase, and not noticed because the old .7
file was still hanging around in my tree and incremental
builds worked fine.)
thanks
-- PMM
- Re: [PATCH v2 20/30] qapi/machine.json: Escape a literal '*' in doc comment, (continued)
- [PATCH v2 21/30] tests/qapi/doc-good.json: Clean up markup, Peter Maydell, 2020/02/13
- [PATCH v2 28/30] qga/qapi-schema.json: Add some headings, Peter Maydell, 2020/02/13
- [PATCH v2 25/30] docs/interop: Convert qemu-ga-ref to rST, Peter Maydell, 2020/02/13
- [PATCH v2 09/30] qapi: Fix indent level on doc comments in json files, Peter Maydell, 2020/02/13
- [PATCH v2 24/30] docs/sphinx: Add new qapi-doc Sphinx extension, Peter Maydell, 2020/02/13
- [PATCH v2 27/30] qapi: Use rST markup for literal blocks, Peter Maydell, 2020/02/13
- [PATCH v2 23/30] scripts/qapi/parser.py: improve doc comment indent handling, Peter Maydell, 2020/02/13
- [PATCH v2 26/30] docs/interop: Convert qemu-qmp-ref to rST, Peter Maydell, 2020/02/13
- Re: [PATCH v2 26/30] docs/interop: Convert qemu-qmp-ref to rST,
Peter Maydell <=
- [PATCH v2 30/30] docs/devel/qapi-code-gen.txt: Update to new rST backend conventions, Peter Maydell, 2020/02/13
- [PATCH v2 29/30] scripts/qapi: Remove texinfo generation support, Peter Maydell, 2020/02/13
- Re: [PATCH v2 00/30] Convert QAPI doc comments to generate rST instead of texinfo, no-reply, 2020/02/13