| Message ID | 20220127112859.222484-1-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, 27 Jan 2022 at 11:29, Markus Armbruster <armbru@redhat.com> wrote: > > The following changes since commit 48302d4eb628ff0bea4d7e92cbf6b726410eb4c3: > > Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20220126' into staging (2022-01-26 10:59:50 +0000) > > are available in the Git repository at: > > git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-01-27 > > for you to fetch changes up to 5161c168b44f3a8fcae8c4f29c81f374ab0af8e1: > > qapi: generate trace events by default (2022-01-27 11:28:44 +0100) > > ---------------------------------------------------------------- > QAPI patches patches for 2022-01-27 > Fails to build on the CI jobs that build docs, eg: https://gitlab.com/qemu-project/qemu/-/jobs/2022584945 https://gitlab.com/qemu-project/qemu/-/jobs/2022585026 Warning, treated as error: /home/gitlab-runner/builds/CMuZxyfG/0/qemu-project/qemu/docs/devel/qapi-code-gen.rst:1634:undefined label: tracing (if the link has no caption the label must precede a section header) thanks -- PMM
27.01.2022 15:56, Peter Maydell wrote: > On Thu, 27 Jan 2022 at 11:29, Markus Armbruster <armbru@redhat.com> wrote: >> >> The following changes since commit 48302d4eb628ff0bea4d7e92cbf6b726410eb4c3: >> >> Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20220126' into staging (2022-01-26 10:59:50 +0000) >> >> are available in the Git repository at: >> >> git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-01-27 >> >> for you to fetch changes up to 5161c168b44f3a8fcae8c4f29c81f374ab0af8e1: >> >> qapi: generate trace events by default (2022-01-27 11:28:44 +0100) >> >> ---------------------------------------------------------------- >> QAPI patches patches for 2022-01-27 >> > > Fails to build on the CI jobs that build docs, eg: > https://gitlab.com/qemu-project/qemu/-/jobs/2022584945 > https://gitlab.com/qemu-project/qemu/-/jobs/2022585026 > > Warning, treated as error: > /home/gitlab-runner/builds/CMuZxyfG/0/qemu-project/qemu/docs/devel/qapi-code-gen.rst:1634:undefined > label: tracing (if the link has no caption the label must precede a > section header) > Sorry :/ again, me not enabling docs compilation to save my time and waste others one :( The fix should look like this (squash to "docs/qapi-code-gen: update to cover trace events code generation" patch): diff --git a/docs/devel/tracing.rst b/docs/devel/tracing.rst index ba83954899..4290ac42ee 100644 --- a/docs/devel/tracing.rst +++ b/docs/devel/tracing.rst @@ -1,3 +1,5 @@ +.. _tracing: + ======= Tracing ======= Than link works. For example, in docs/devel/build-system.rst we have :ref:`kconfig` and docs/devel/kconfig.rst starts with .. _kconfig:
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> writes: > 27.01.2022 15:56, Peter Maydell wrote: >> On Thu, 27 Jan 2022 at 11:29, Markus Armbruster <armbru@redhat.com> wrote: >>> >>> The following changes since commit 48302d4eb628ff0bea4d7e92cbf6b726410eb4c3: >>> >>> Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20220126' into staging (2022-01-26 10:59:50 +0000) >>> >>> are available in the Git repository at: >>> >>> git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-01-27 >>> >>> for you to fetch changes up to 5161c168b44f3a8fcae8c4f29c81f374ab0af8e1: >>> >>> qapi: generate trace events by default (2022-01-27 11:28:44 +0100) >>> >>> ---------------------------------------------------------------- >>> QAPI patches patches for 2022-01-27 >>> >> >> Fails to build on the CI jobs that build docs, eg: >> https://gitlab.com/qemu-project/qemu/-/jobs/2022584945 >> https://gitlab.com/qemu-project/qemu/-/jobs/2022585026 >> >> Warning, treated as error: >> /home/gitlab-runner/builds/CMuZxyfG/0/qemu-project/qemu/docs/devel/qapi-code-gen.rst:1634:undefined >> label: tracing (if the link has no caption the label must precede a >> section header) >> > > Sorry :/ again, me not enabling docs compilation to save my time and waste others one :( I'm not blaming you for that. I disabled it myself after the conversion to Sphinx wrecked my compile times due to "touch any schema file, reformat truckloads of docs". I normally test pull requests with a tree that has it enabled, but forgot. > > The fix should look like this (squash to "docs/qapi-code-gen: update to cover trace events code generation" patch): > > diff --git a/docs/devel/tracing.rst b/docs/devel/tracing.rst > index ba83954899..4290ac42ee 100644 > --- a/docs/devel/tracing.rst > +++ b/docs/devel/tracing.rst > @@ -1,3 +1,5 @@ > +.. _tracing: > + > ======= > Tracing > ======= > > > Than link works. For example, in docs/devel/build-system.rst we have :ref:`kconfig` and docs/devel/kconfig.rst starts with > > .. _kconfig: Thanks!
The following changes since commit 48302d4eb628ff0bea4d7e92cbf6b726410eb4c3: Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20220126' into staging (2022-01-26 10:59:50 +0000) are available in the Git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-01-27 for you to fetch changes up to 5161c168b44f3a8fcae8c4f29c81f374ab0af8e1: qapi: generate trace events by default (2022-01-27 11:28:44 +0100) ---------------------------------------------------------------- QAPI patches patches for 2022-01-27 ---------------------------------------------------------------- Victor Toso (1): schemas: add missing vim modeline Vladimir Sementsov-Ogievskiy (7): qapi/gen: Add FOO.trace-events output module qapi/commands: refactor error handling code qapi/commands: Optionally generate trace for QMP commands meson: generate trace events for qmp commands docs/qapi-code-gen: update to cover trace events code generation meson: document why we don't generate trace events for tests/ and qga/ qapi: generate trace events by default docs/devel/qapi-code-gen.rst | 25 ++++++++++- meson.build | 3 ++ qapi/audio.json | 1 + qapi/compat.json | 1 + qapi/replay.json | 1 + qapi/trace.json | 1 + qapi/meson.build | 7 +++ qga/meson.build | 10 ++++- scripts/qapi/commands.py | 100 +++++++++++++++++++++++++++++++++++++------ scripts/qapi/gen.py | 31 ++++++++++++-- scripts/qapi/main.py | 14 ++++-- tests/meson.build | 10 ++++- trace/meson.build | 11 +++-- 13 files changed, 188 insertions(+), 27 deletions(-)