qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Woodhouse <dwmw2@infradead.org>
To: <qemu-devel@nongnu.org>
Cc: "Kevin Wolf" <kwolf@redhat.com>,
	"Hanna Reitz" <hreitz@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Stefano Stabellini" <sstabellini@kernel.org>,
	"Anthony Perard" <anthony.perard@citrix.com>,
	"Paul Durrant" <paul@xen.org>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Eduardo Habkost" <eduardo@habkost.net>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Jason Wang" <jasowang@redhat.com>,
	"Marcelo Tosatti" <mtosatti@redhat.com>,
	qemu-block@nongnu.org, xen-devel@lists.xenproject.org,
	kvm@vger.kernel.org
Subject: [PATCH v4 16/17] doc/sphinx/hxtool.py: add optional label argument to SRST directive
Date: Mon, 6 Nov 2023 14:35:06 +0000	[thread overview]
Message-ID: <20231106143507.1060610-17-dwmw2@infradead.org> (raw)
In-Reply-To: <20231106143507.1060610-1-dwmw2@infradead.org>

From: David Woodhouse <dwmw@amazon.co.uk>

We can't just embed labels directly into files like qemu-options.hx which
are included from multiple top-level RST files, because Sphinx sees the
labels as duplicate: https://github.com/sphinx-doc/sphinx/issues/9707

So add an 'emitrefs' option to the Sphinx hxtool-doc directive, which is
set only in invocation.rst and not from the HTML rendition of the man
page. Along with an argument to the SRST directive which causes a label
of the form '.. _LABEL-reference-label:' to be emitted when the emitrefs
option is set.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
 docs/sphinx/hxtool.py      | 18 +++++++++++++++++-
 docs/system/invocation.rst |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/sphinx/hxtool.py b/docs/sphinx/hxtool.py
index 9f6b9d87dc..bfb0929573 100644
--- a/docs/sphinx/hxtool.py
+++ b/docs/sphinx/hxtool.py
@@ -78,18 +78,28 @@ def parse_archheading(file, lnum, line):
         serror(file, lnum, "Invalid ARCHHEADING line")
     return match.group(1)
 
+def parse_srst(file, lnum, line):
+    """Handle an SRST directive"""
+    # The input should be "SRST(label)".
+    match = re.match(r'SRST\((.*?)\)', line)
+    if match is None:
+        serror(file, lnum, "Invalid SRST line")
+    return match.group(1)
+
 class HxtoolDocDirective(Directive):
     """Extract rST fragments from the specified .hx file"""
     required_argument = 1
     optional_arguments = 1
     option_spec = {
-        'hxfile': directives.unchanged_required
+        'hxfile': directives.unchanged_required,
+        'emitrefs': directives.flag
     }
     has_content = False
 
     def run(self):
         env = self.state.document.settings.env
         hxfile = env.config.hxtool_srctree + '/' + self.arguments[0]
+        emitrefs = "emitrefs" in self.options
 
         # Tell sphinx of the dependency
         env.note_dependency(os.path.abspath(hxfile))
@@ -113,6 +123,12 @@ def run(self):
                         serror(hxfile, lnum, 'expected ERST, found SRST')
                     else:
                         state = HxState.RST
+                        if emitrefs and line != "SRST":
+                            label = parse_srst(hxfile, lnum, line)
+                            if label != "":
+                                rstlist.append("", hxfile, lnum - 1)
+                                refline = ".. _" + label + "-reference-label:"
+                                rstlist.append(refline, hxfile, lnum - 1)
                 elif directive == 'ERST':
                     if state == HxState.CTEXT:
                         serror(hxfile, lnum, 'expected SRST, found ERST')
diff --git a/docs/system/invocation.rst b/docs/system/invocation.rst
index 4ba38fc23d..ef75dad2e2 100644
--- a/docs/system/invocation.rst
+++ b/docs/system/invocation.rst
@@ -11,6 +11,7 @@ disk_image is a raw hard disk image for IDE hard disk 0. Some targets do
 not need a disk image.
 
 .. hxtool-doc:: qemu-options.hx
+    :emitrefs:
 
 Device URL Syntax
 ~~~~~~~~~~~~~~~~~
-- 
2.34.1



  parent reply	other threads:[~2023-11-06 14:38 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-06 14:34 [PATCH v4 00/17] Get Xen PV shim running in QEMU, add net and console David Woodhouse
2023-11-06 14:34 ` [PATCH v4 01/17] i386/xen: Ignore VCPU_SSHOTTMR_future flag in set_singleshot_timer() David Woodhouse
2023-11-06 14:34 ` [PATCH v4 02/17] hw/xen: Clean up event channel 'type_val' handling to use union David Woodhouse
2023-11-06 14:34 ` [PATCH v4 03/17] include: update Xen public headers to Xen 4.17.2 release David Woodhouse
2023-11-06 14:34 ` [PATCH v4 04/17] i386/xen: advertise XEN_HVM_CPUID_UPCALL_VECTOR in CPUID David Woodhouse
2023-11-06 14:34 ` [PATCH v4 05/17] hw/xen: populate store frontend nodes with XenStore PFN/port David Woodhouse
2023-11-06 14:34 ` [PATCH v4 06/17] hw/xen: automatically assign device index to block devices David Woodhouse
2023-11-06 15:58   ` Paul Durrant
2023-11-06 14:34 ` [PATCH v4 07/17] hw/xen: add get_frontend_path() method to XenDeviceClass David Woodhouse
2023-11-06 14:34 ` [PATCH v4 08/17] hw/xen: do not repeatedly try to create a failing backend device David Woodhouse
2023-11-06 14:34 ` [PATCH v4 09/17] hw/xen: update Xen console to XenDevice model David Woodhouse
2023-11-06 14:35 ` [PATCH v4 10/17] hw/xen: add support for Xen primary console in emulated mode David Woodhouse
2023-11-06 14:35 ` [PATCH v4 11/17] hw/xen: only remove peers of PCI NICs on unplug David Woodhouse
2023-11-06 14:35 ` [PATCH v4 12/17] hw/xen: update Xen PV NIC to XenDevice model David Woodhouse
2023-11-06 14:35 ` [PATCH v4 13/17] hw/i386/pc: support '-nic' for xen-net-device David Woodhouse
2023-11-06 16:01   ` Paul Durrant
2023-11-06 14:35 ` [PATCH v4 14/17] net: do not delete nics in net_cleanup() David Woodhouse
2023-11-07  9:26   ` David Woodhouse
2023-11-06 14:35 ` [PATCH v4 15/17] xen-platform: unplug AHCI disks David Woodhouse
2023-11-06 14:35 ` David Woodhouse [this message]
2023-11-06 16:06   ` [PATCH v4 16/17] doc/sphinx/hxtool.py: add optional label argument to SRST directive Paul Durrant
2023-11-07  9:25   ` David Woodhouse
2023-11-06 14:35 ` [PATCH v4 17/17] docs: update Xen-on-KVM documentation David Woodhouse
2023-11-06 16:10   ` Paul Durrant

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231106143507.1060610-17-dwmw2@infradead.org \
    --to=dwmw2@infradead.org \
    --cc=anthony.perard@citrix.com \
    --cc=eduardo@habkost.net \
    --cc=hreitz@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=kwolf@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=mtosatti@redhat.com \
    --cc=paul@xen.org \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=sstabellini@kernel.org \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).