On Sat, 27 Jan 2024 at 23:18, David Woodhouse <dw...@infradead.org> wrote: > > From: David Woodhouse <d...@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 optional argument to the SRST directive which causes a label > of the form '.. _DOCNAME-HXFILE-LABEL:' to be emitted, where 'DOCNAME' > is the name of the top level rST file, 'HXFILE' is the filename of the > .hx file, and 'LABEL' is the text provided within the 'SRST()' directive. > Using the DOCNAME of the top-level rST document means that it is unique > even when the .hx file is included from two different documents, as is > the case for qemu-options.hx > > Now where the Xen PV documentation refers to the documentation for the > -initrd command line option, it can emit a link directly to it as > '<system/invocation-qemu-options-initrd>'. > > Signed-off-by: David Woodhouse <d...@amazon.co.uk> > Reviewed-by: Paul Durrant <p...@xen.org> > ---
This looks good so Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> but something has got mangled somewhere: patchew can't apply it: https://patchew.org/QEMU/4114f7204e892316d66be8f810eb5b8de4c0f75f.ca...@infradead.org/ and patches doesn't like it either. In both cases git am barfs with error: corrupt patch at line 23 I'm guessing it doesn't like the quoted-printable encoding. thanks -- PMM