Peter Maydell <peter.mayd...@linaro.org> writes:
> On Thu, 26 Jan 2023 at 11:22, Alex Bennée <alex.ben...@linaro.org> wrote: >> >> The following changes since commit 13356edb87506c148b163b8c7eb0695647d00c2a: >> >> Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu >> into staging (2023-01-24 09:45:33 +0000) >> >> are available in the Git repository at: >> >> https://gitlab.com/stsquad/qemu.git tags/pull-jan-omnibus-260123-1 >> >> for you to fetch changes up to d200653282f50df2a994a0609f88baa6a5889f80: >> >> plugins: Iterate on cb_lists in qemu_plugin_user_exit (2023-01-26 11:12:01 >> +0000) >> >> ---------------------------------------------------------------- >> Testing, docs, semihosting and plugin updates >> >> - update playbooks for custom runners >> - add section timing support to gitlab >> - upgrade fedora images to 37 >> - purge perl from the build system and deps >> - disable unstable tests in CI >> - improve intro, emulation and semihosting docs >> - semihosting bug fix and O_BINARY default >> - add memory-sve test >> - fix some races in qht >> - improve plugin handling of memory helpers >> - optimise plugin hooks >> - fix some plugin deadlocks >> > > Hi; this fails the docs build on macos 12 (probably a difference > in behaviour across Sphinx versions): > https://gitlab.com/qemu-project/qemu/-/jobs/3697858012 > > FAILED: docs/docs.stamp > /usr/bin/env CONFDIR=etc/qemu /opt/homebrew/bin/sphinx-build -q -W > -Dversion=7.2.50 -Drelease= -Ddepfile=docs/docs.d > -Ddepfile_stamp=docs/docs.stamp -b html -d > /private/var/folders/76/zy5ktkns50v6gt5g8r0sf6sc0000gn/T/cirrus-ci-build/build/docs/manual.p > /private/var/folders/76/zy5ktkns50v6gt5g8r0sf6sc0000gn/T/cirrus-ci-build/docs > /private/var/folders/76/zy5ktkns50v6gt5g8r0sf6sc0000gn/T/cirrus-ci-build/build/docs/manual > Warning, treated as error: > /private/var/folders/76/zy5ktkns50v6gt5g8r0sf6sc0000gn/T/cirrus-ci-build/qemu-options.hx:161:duplicate > label machine options, other instance in > /private/var/folders/76/zy5ktkns50v6gt5g8r0sf6sc0000gn/T/cirrus-ci-build/docs/system/invocation.rst > > I think this is "you can't put labels in qemu-options.hx, > because it gets included in two .rst files (invocation.rst > and qemu-manpage.rst), and Sphinx complains about the > duplicate labels, even though one of the two files is > only used in the HTML and one is only used in the manpages". Oh boo - anyway to work around that because they are helpful links? -- Alex Bennée Virtualisation Tech Lead @ Linaro
