[PATCH v2 0/9] qapi: convert example sections to qmp-example rST directives

John Snow posted 9 patches 3 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20240717021312.606116-1-jsnow@redhat.com
Maintainers: Markus Armbruster <armbru@redhat.com>, Michael Roth <michael.roth@amd.com>, Peter Maydell <peter.maydell@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Eric Blake <eblake@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Jason Wang <jasowang@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>, Jiri Pirko <jiri@resnulli.us>, Stefan Berger <stefanb@linux.vnet.ibm.com>, Stefan Hajnoczi <stefanha@redhat.com>, Mads Ynddal <mads@ynddal.dk>, Alex Williamson <alex.williamson@redhat.com>, "Cédric Le Goater" <clg@redhat.com>, Lukas Straub <lukasstraub2@web.de>
docs/devel/qapi-code-gen.rst           |  58 +++++++++--
docs/sphinx-static/theme_overrides.css |  49 ++++++++++
docs/sphinx/qapidoc.py                 | 130 ++++++++++++++++++++++---
qapi/acpi.json                         |   4 +-
qapi/block-core.json                   |  88 +++++++++--------
qapi/block.json                        |  57 ++++++-----
qapi/char.json                         |  24 +++--
qapi/control.json                      |   8 +-
qapi/dump.json                         |   8 +-
qapi/machine-target.json               |   2 +-
qapi/machine.json                      |  68 +++++++------
qapi/migration.json                    |  90 +++++++++--------
qapi/misc-target.json                  |  22 ++---
qapi/misc.json                         |  32 +++---
qapi/net.json                          |  22 +++--
qapi/pci.json                          |   2 +-
qapi/qdev.json                         |  10 +-
qapi/qom.json                          |  16 +--
qapi/replay.json                       |   8 +-
qapi/rocker.json                       |   8 +-
qapi/run-state.json                    |  32 +++---
qapi/tpm.json                          |   6 +-
qapi/trace.json                        |   4 +-
qapi/transaction.json                  |   2 +-
qapi/ui.json                           |  45 ++++-----
qapi/vfio.json                         |   2 +-
qapi/virtio.json                       |  45 ++++++---
qapi/yank.json                         |   4 +-
scripts/qapi-lint.sh                   |  61 ++++++++++++
scripts/qapi/Makefile                  |   5 +
scripts/qapi/parser.py                 |  10 +-
tests/qapi-schema/doc-good.json        |  19 ++--
tests/qapi-schema/doc-good.out         |  26 +++--
tests/qapi-schema/doc-good.txt         |  23 ++---
34 files changed, 662 insertions(+), 328 deletions(-)
create mode 100755 scripts/qapi-lint.sh
create mode 100644 scripts/qapi/Makefile
[PATCH v2 0/9] qapi: convert example sections to qmp-example rST directives
Posted by John Snow 3 months ago
This patchset focuses on converting example sections to rST directives
using a new `.. qmp-example::` directive.

V2:
 - Rebased on origin/master; converted one more example
 - Fixed (most?) minor nits from last review
 - Didn't address lack of newline in text mode or enhanced lexer (yet)

Changes since this was split out from the prior series:

- Harmonie updated the CSS for the example block section.
  I think it's really tidy now! Thanks Harmonie!
- Dependence on SphinxDirective was removed, but it will likely
  re-appear in the next series anyway.
- qapi-code-gen.rst was updated with a section on how to write examples.
- Various minor tweaks to comments, commit messages, docs, etc.

Harmonie Snow (1):
  docs/sphinx: add CSS styling for qmp-example directive

John Snow (8):
  [DO-NOT-MERGE]: Add some ad-hoc linting helpers.
  docs/qapidoc: factor out do_parse()
  docs/qapidoc: create qmp-example directive
  docs/qapidoc: add QMP highlighting to annotated qmp-example blocks
  qapi: convert "Example" sections without titles
  qapi: convert "Example" sections with titles
  qapi: convert "Example" sections with longer prose
  qapi: remove "Example" doc section

 docs/devel/qapi-code-gen.rst           |  58 +++++++++--
 docs/sphinx-static/theme_overrides.css |  49 ++++++++++
 docs/sphinx/qapidoc.py                 | 130 ++++++++++++++++++++++---
 qapi/acpi.json                         |   4 +-
 qapi/block-core.json                   |  88 +++++++++--------
 qapi/block.json                        |  57 ++++++-----
 qapi/char.json                         |  24 +++--
 qapi/control.json                      |   8 +-
 qapi/dump.json                         |   8 +-
 qapi/machine-target.json               |   2 +-
 qapi/machine.json                      |  68 +++++++------
 qapi/migration.json                    |  90 +++++++++--------
 qapi/misc-target.json                  |  22 ++---
 qapi/misc.json                         |  32 +++---
 qapi/net.json                          |  22 +++--
 qapi/pci.json                          |   2 +-
 qapi/qdev.json                         |  10 +-
 qapi/qom.json                          |  16 +--
 qapi/replay.json                       |   8 +-
 qapi/rocker.json                       |   8 +-
 qapi/run-state.json                    |  32 +++---
 qapi/tpm.json                          |   6 +-
 qapi/trace.json                        |   4 +-
 qapi/transaction.json                  |   2 +-
 qapi/ui.json                           |  45 ++++-----
 qapi/vfio.json                         |   2 +-
 qapi/virtio.json                       |  45 ++++++---
 qapi/yank.json                         |   4 +-
 scripts/qapi-lint.sh                   |  61 ++++++++++++
 scripts/qapi/Makefile                  |   5 +
 scripts/qapi/parser.py                 |  10 +-
 tests/qapi-schema/doc-good.json        |  19 ++--
 tests/qapi-schema/doc-good.out         |  26 +++--
 tests/qapi-schema/doc-good.txt         |  23 ++---
 34 files changed, 662 insertions(+), 328 deletions(-)
 create mode 100755 scripts/qapi-lint.sh
 create mode 100644 scripts/qapi/Makefile

-- 
2.45.0

Re: [PATCH v2 0/9] qapi: convert example sections to qmp-example rST directives
Posted by Markus Armbruster 3 months ago
John Snow <jsnow@redhat.com> writes:

> This patchset focuses on converting example sections to rST directives
> using a new `.. qmp-example::` directive.

Queued, thanks!
Re: [PATCH v2 0/9] qapi: convert example sections to qmp-example rST directives
Posted by John Snow 3 months ago
On Wed, Jul 17, 2024, 6:47 AM Markus Armbruster <armbru@redhat.com> wrote:

> John Snow <jsnow@redhat.com> writes:
>
> > This patchset focuses on converting example sections to rST directives
> > using a new `.. qmp-example::` directive.
>
> Queued, thanks!
>

Yay!

>