1. Patchew
  2. QEMU
  3. View series

[PULL v2 00/17] QAPI patches patches for 2023-05-09

Markus Armbruster posted 17 patches 11 months, 3 weeks ago
Only 3 patches received!
docs/devel/qapi-code-gen.rst          |   74 +-
docs/sphinx/qapidoc.py                |    3 +
meson.build                           |    2 +-
qapi/acpi.json                        |   50 +-
qapi/audio.json                       |   93 +-
qapi/authz.json                       |   29 +-
qapi/block-core.json                  | 2801 +++++++++++++++++----------------
qapi/block-export.json                |  244 +--
qapi/block.json                       |  214 +--
qapi/char.json                        |  134 +-
qapi/common.json                      |   19 +-
qapi/compat.json                      |   13 +-
qapi/control.json                     |   59 +-
qapi/crypto.json                      |  261 +--
qapi/cryptodev.json                   |    3 +
qapi/cxl.json                         |   74 +-
qapi/dump.json                        |   78 +-
qapi/error.json                       |    6 +-
qapi/introspect.json                  |   89 +-
qapi/job.json                         |  139 +-
qapi/machine-target.json              |  303 ++--
qapi/machine.json                     |  389 ++---
qapi/migration.json                   | 1120 +++++++------
qapi/misc-target.json                 |   67 +-
qapi/misc.json                        |  180 +--
qapi/net.json                         |  260 ++-
qapi/pci.json                         |   35 +-
qapi/qapi-schema.json                 |   25 +-
qapi/qdev.json                        |   63 +-
qapi/qom.json                         |  404 ++---
qapi/rdma.json                        |    1 -
qapi/replay.json                      |   48 +-
qapi/rocker.json                      |   20 +-
qapi/run-state.json                   |  227 +--
qapi/sockets.json                     |   50 +-
qapi/stats.json                       |   83 +-
qapi/tpm.json                         |   20 +-
qapi/trace.json                       |   34 +-
qapi/transaction.json                 |   87 +-
qapi/ui.json                          |  435 ++---
qapi/virtio.json                      |   84 +-
qapi/yank.json                        |   42 +-
qga/qapi-schema.json                  |  668 ++++----
scripts/qapi/parser.py                |  141 +-
tests/qapi-schema/doc-bad-indent.err  |    2 +-
tests/qapi-schema/doc-bad-indent.json |    3 +-
tests/qapi-schema/doc-good.json       |   20 +-
tests/qapi-schema/doc-good.out        |   19 +-
48 files changed, 4837 insertions(+), 4378 deletions(-)
[PULL v2 00/17] QAPI patches patches for 2023-05-09
Posted by Markus Armbruster 11 months, 3 weeks ago 
The following changes since commit 792f77f376adef944f9a03e601f6ad90c2f891b2:

  Merge tag 'pull-loongarch-20230506' of https://gitlab.com/gaosong/qemu into staging (2023-05-06 08:11:52 +0100)

are available in the Git repository at:

  https://repo.or.cz/qemu/armbru.git tags/pull-qapi-2023-05-09-v2

for you to fetch changes up to a937b6aa739f65f2cae2ad9a7eb65a309ad2a359:

  qapi: Reformat doc comments to conform to current conventions (2023-05-10 10:01:01 +0200)

----------------------------------------------------------------
QAPI patches patches for 2023-05-09

----------------------------------------------------------------
Markus Armbruster (17):
      docs/devel/qapi-code-gen: Clean up use of quotes a bit
      docs/devel/qapi-code-gen: Turn FIXME admonitions into comments
      qapi: Fix crash on stray double quote character
      meson: Fix to make QAPI generator output depend on main.py
      Revert "qapi: BlockExportRemoveMode: move comments to TODO"
      sphinx/qapidoc: Do not emit TODO sections into user manuals
      qapi: Tidy up a slightly awkward TODO comment
      qapi/dump: Indent bulleted lists consistently
      tests/qapi-schema/doc-good: Improve a comment
      tests/qapi-schema/doc-good: Improve argument description tests
      qapi: Fix argument description indentation stripping
      qapi: Rewrite parsing of doc comment section symbols and tags
      qapi: Relax doc string @name: description indentation rules
      qapi: Section parameter @indent is no longer used, drop
      docs/devel/qapi-code-gen: Update doc comment conventions
      qga/qapi-schema: Reformat doc comments to conform to current conventions
      qapi: Reformat doc comments to conform to current conventions

 docs/devel/qapi-code-gen.rst          |   74 +-
 docs/sphinx/qapidoc.py                |    3 +
 meson.build                           |    2 +-
 qapi/acpi.json                        |   50 +-
 qapi/audio.json                       |   93 +-
 qapi/authz.json                       |   29 +-
 qapi/block-core.json                  | 2801 +++++++++++++++++----------------
 qapi/block-export.json                |  244 +--
 qapi/block.json                       |  214 +--
 qapi/char.json                        |  134 +-
 qapi/common.json                      |   19 +-
 qapi/compat.json                      |   13 +-
 qapi/control.json                     |   59 +-
 qapi/crypto.json                      |  261 +--
 qapi/cryptodev.json                   |    3 +
 qapi/cxl.json                         |   74 +-
 qapi/dump.json                        |   78 +-
 qapi/error.json                       |    6 +-
 qapi/introspect.json                  |   89 +-
 qapi/job.json                         |  139 +-
 qapi/machine-target.json              |  303 ++--
 qapi/machine.json                     |  389 ++---
 qapi/migration.json                   | 1120 +++++++------
 qapi/misc-target.json                 |   67 +-
 qapi/misc.json                        |  180 +--
 qapi/net.json                         |  260 ++-
 qapi/pci.json                         |   35 +-
 qapi/qapi-schema.json                 |   25 +-
 qapi/qdev.json                        |   63 +-
 qapi/qom.json                         |  404 ++---
 qapi/rdma.json                        |    1 -
 qapi/replay.json                      |   48 +-
 qapi/rocker.json                      |   20 +-
 qapi/run-state.json                   |  227 +--
 qapi/sockets.json                     |   50 +-
 qapi/stats.json                       |   83 +-
 qapi/tpm.json                         |   20 +-
 qapi/trace.json                       |   34 +-
 qapi/transaction.json                 |   87 +-
 qapi/ui.json                          |  435 ++---
 qapi/virtio.json                      |   84 +-
 qapi/yank.json                        |   42 +-
 qga/qapi-schema.json                  |  668 ++++----
 scripts/qapi/parser.py                |  141 +-
 tests/qapi-schema/doc-bad-indent.err  |    2 +-
 tests/qapi-schema/doc-bad-indent.json |    3 +-
 tests/qapi-schema/doc-good.json       |   20 +-
 tests/qapi-schema/doc-good.out        |   19 +-
 48 files changed, 4837 insertions(+), 4378 deletions(-)

-- 
2.39.2
Re: [PULL v2 00/17] QAPI patches patches for 2023-05-09
Posted by Richard Henderson 11 months, 3 weeks ago 
On 5/10/23 09:12, Markus Armbruster wrote:
> The following changes since commit 792f77f376adef944f9a03e601f6ad90c2f891b2:
> 
>    Merge tag 'pull-loongarch-20230506' of https://gitlab.com/gaosong/qemu into staging (2023-05-06 08:11:52 +0100)
> 
> are available in the Git repository at:
> 
>    https://repo.or.cz/qemu/armbru.git tags/pull-qapi-2023-05-09-v2
> 
> for you to fetch changes up to a937b6aa739f65f2cae2ad9a7eb65a309ad2a359:
> 
>    qapi: Reformat doc comments to conform to current conventions (2023-05-10 10:01:01 +0200)
> 
> ----------------------------------------------------------------
> QAPI patches patches for 2023-05-09
> 
> ----------------------------------------------------------------
> Markus Armbruster (17):
>        docs/devel/qapi-code-gen: Clean up use of quotes a bit
>        docs/devel/qapi-code-gen: Turn FIXME admonitions into comments
>        qapi: Fix crash on stray double quote character
>        meson: Fix to make QAPI generator output depend on main.py
>        Revert "qapi: BlockExportRemoveMode: move comments to TODO"
>        sphinx/qapidoc: Do not emit TODO sections into user manuals
>        qapi: Tidy up a slightly awkward TODO comment
>        qapi/dump: Indent bulleted lists consistently
>        tests/qapi-schema/doc-good: Improve a comment
>        tests/qapi-schema/doc-good: Improve argument description tests
>        qapi: Fix argument description indentation stripping
>        qapi: Rewrite parsing of doc comment section symbols and tags
>        qapi: Relax doc string @name: description indentation rules
>        qapi: Section parameter @indent is no longer used, drop
>        docs/devel/qapi-code-gen: Update doc comment conventions
>        qga/qapi-schema: Reformat doc comments to conform to current conventions
>        qapi: Reformat doc comments to conform to current conventions

I didn't notice earlier, because centos-stream-8-x86_64 failure is optional,
but this has another error:

https://gitlab.com/qemu-project/qemu/-/jobs/4258751398#L4649

Exception occurred:
   File 
"/home/gitlab-runner/builds/Jpwtyaz7/0/qemu-project/qemu/docs/../scripts/qapi/parser.py", 
line 566, in QAPIDoc
     def _match_at_name_colon(string: str) -> re.Match:
AttributeError: module 're' has no attribute 'Match'


r~
Re: [PULL v2 00/17] QAPI patches patches for 2023-05-09
Posted by Markus Armbruster 11 months, 3 weeks ago 
Richard Henderson <richard.henderson@linaro.org> writes:

> On 5/10/23 09:12, Markus Armbruster wrote:
>> The following changes since commit 792f77f376adef944f9a03e601f6ad90c2f891b2:
>>    Merge tag 'pull-loongarch-20230506' of https://gitlab.com/gaosong/qemu into staging (2023-05-06 08:11:52 +0100)
>> are available in the Git repository at:
>>    https://repo.or.cz/qemu/armbru.git tags/pull-qapi-2023-05-09-v2
>> for you to fetch changes up to a937b6aa739f65f2cae2ad9a7eb65a309ad2a359:
>>    qapi: Reformat doc comments to conform to current conventions (2023-05-10 10:01:01 +0200)
>> ----------------------------------------------------------------
>> QAPI patches patches for 2023-05-09
>> ----------------------------------------------------------------
>> Markus Armbruster (17):
>>        docs/devel/qapi-code-gen: Clean up use of quotes a bit
>>        docs/devel/qapi-code-gen: Turn FIXME admonitions into comments
>>        qapi: Fix crash on stray double quote character
>>        meson: Fix to make QAPI generator output depend on main.py
>>        Revert "qapi: BlockExportRemoveMode: move comments to TODO"
>>        sphinx/qapidoc: Do not emit TODO sections into user manuals
>>        qapi: Tidy up a slightly awkward TODO comment
>>        qapi/dump: Indent bulleted lists consistently
>>        tests/qapi-schema/doc-good: Improve a comment
>>        tests/qapi-schema/doc-good: Improve argument description tests
>>        qapi: Fix argument description indentation stripping
>>        qapi: Rewrite parsing of doc comment section symbols and tags
>>        qapi: Relax doc string @name: description indentation rules
>>        qapi: Section parameter @indent is no longer used, drop
>>        docs/devel/qapi-code-gen: Update doc comment conventions
>>        qga/qapi-schema: Reformat doc comments to conform to current conventions
>>        qapi: Reformat doc comments to conform to current conventions
>
> I didn't notice earlier, because centos-stream-8-x86_64 failure is optional,
> but this has another error:
>
> https://gitlab.com/qemu-project/qemu/-/jobs/4258751398#L4649
>
> Exception occurred:
>   File "/home/gitlab-runner/builds/Jpwtyaz7/0/qemu-project/qemu/docs/../scripts/qapi/parser.py", line 566, in QAPIDoc
>     def _match_at_name_colon(string: str) -> re.Match:
> AttributeError: module 're' has no attribute 'Match'

I'll take care of it.  Thanks!
Re: [PULL v2 00/17] QAPI patches patches for 2023-05-09
Posted by Markus Armbruster 11 months, 3 weeks ago 
Markus Armbruster <armbru@redhat.com> writes:

> Richard Henderson <richard.henderson@linaro.org> writes:
>
>> I didn't notice earlier, because centos-stream-8-x86_64 failure is optional,
>> but this has another error:
>>
>> https://gitlab.com/qemu-project/qemu/-/jobs/4258751398#L4649
>>
>> Exception occurred:
>>   File "/home/gitlab-runner/builds/Jpwtyaz7/0/qemu-project/qemu/docs/../scripts/qapi/parser.py", line 566, in QAPIDoc
>>     def _match_at_name_colon(string: str) -> re.Match:
>> AttributeError: module 're' has no attribute 'Match'
>
> I'll take care of it.  Thanks!

I tried to reproduce locally with make target docker-test-build@centos8,
no dice.

I'll post a patch to make mypy happy again.  Perhaps it'll unbreak CI,
too.
Re: [PULL v2 00/17] QAPI patches patches for 2023-05-09
Posted by Richard Henderson 11 months, 3 weeks ago 
On 5/11/23 12:11, Markus Armbruster wrote:
> Markus Armbruster <armbru@redhat.com> writes:
> 
>> Richard Henderson <richard.henderson@linaro.org> writes:
>>
>>> I didn't notice earlier, because centos-stream-8-x86_64 failure is optional,
>>> but this has another error:
>>>
>>> https://gitlab.com/qemu-project/qemu/-/jobs/4258751398#L4649
>>>
>>> Exception occurred:
>>>    File "/home/gitlab-runner/builds/Jpwtyaz7/0/qemu-project/qemu/docs/../scripts/qapi/parser.py", line 566, in QAPIDoc
>>>      def _match_at_name_colon(string: str) -> re.Match:
>>> AttributeError: module 're' has no attribute 'Match'
>>
>> I'll take care of it.  Thanks!
> 
> I tried to reproduce locally with make target docker-test-build@centos8,
> no dice.

Yeah, we don't seem to have a docker image that matches -- it is set up by

   scripts/ci/org.centos/stream/8/x86_64/configure

for some reason. Perhaps "make vm-build-centos" was intended to be the way, but that 
appears to be broken too.

Alex?


r~
Re: [PULL v2 00/17] QAPI patches patches for 2023-05-09
Posted by Richard Henderson 11 months, 3 weeks ago 
On 5/10/23 09:12, Markus Armbruster wrote:
> The following changes since commit 792f77f376adef944f9a03e601f6ad90c2f891b2:
> 
>    Merge tag 'pull-loongarch-20230506' ofhttps://gitlab.com/gaosong/qemu  into staging (2023-05-06 08:11:52 +0100)
> 
> are available in the Git repository at:
> 
>    https://repo.or.cz/qemu/armbru.git  tags/pull-qapi-2023-05-09-v2
> 
> for you to fetch changes up to a937b6aa739f65f2cae2ad9a7eb65a309ad2a359:
> 
>    qapi: Reformat doc comments to conform to current conventions (2023-05-10 10:01:01 +0200)
> 
> ----------------------------------------------------------------
> QAPI patches patches for 2023-05-09

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.