[PULL v2 0/4] QAPI patches patches for 2023-05-17

Markus Armbruster posted 4 patches 11 months, 2 weeks ago
Failed in applying to current master (apply log)
docs/devel/qapi-code-gen.rst                  |   3 +-
docs/interop/index.rst                        |   1 +
docs/interop/qmp-intro.txt                    |  88 -------
docs/interop/{qmp-spec.txt => qmp-spec.rst}   | 337 ++++++++++++++------------
qapi/control.json                             |   4 +-
qapi/qapi-schema.json                         |   3 +-
qobject/json-lexer.c                          |   2 +-
python/qemu/qmp/models.py                     |   8 +-
python/qemu/qmp/qmp_client.py                 |   4 +-
qemu-options.hx                               |  28 ++-
scripts/qapi/parser.py                        |   4 +-
tests/qapi-schema/doc-interleaved-section.err |   2 +-
12 files changed, 224 insertions(+), 260 deletions(-)
delete mode 100644 docs/interop/qmp-intro.txt
rename docs/interop/{qmp-spec.txt => qmp-spec.rst} (56%)
[PULL v2 0/4] QAPI patches patches for 2023-05-17
Posted by Markus Armbruster 11 months, 2 weeks ago
The following changes since commit aa222a8e4f975284b3f8f131653a4114b3d333b3:

  Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2023-05-19 12:17:16 -0700)

are available in the Git repository at:

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

for you to fetch changes up to 0ec4468f233c53eb854f204d105d965455deec51:

  docs/interop: Delete qmp-intro.txt (2023-05-22 10:22:29 +0200)

----------------------------------------------------------------
QAPI patches patches for 2023-05-17

----------------------------------------------------------------
Markus Armbruster (1):
      qapi: Improve error message for description following section

Peter Maydell (3):
      docs/interop: Convert qmp-spec.txt to rST
      docs/interop/qmp-spec: Update error description for parsing errors
      docs/interop: Delete qmp-intro.txt

 docs/devel/qapi-code-gen.rst                  |   3 +-
 docs/interop/index.rst                        |   1 +
 docs/interop/qmp-intro.txt                    |  88 -------
 docs/interop/{qmp-spec.txt => qmp-spec.rst}   | 337 ++++++++++++++------------
 qapi/control.json                             |   4 +-
 qapi/qapi-schema.json                         |   3 +-
 qobject/json-lexer.c                          |   2 +-
 python/qemu/qmp/models.py                     |   8 +-
 python/qemu/qmp/qmp_client.py                 |   4 +-
 qemu-options.hx                               |  28 ++-
 scripts/qapi/parser.py                        |   4 +-
 tests/qapi-schema/doc-interleaved-section.err |   2 +-
 12 files changed, 224 insertions(+), 260 deletions(-)
 delete mode 100644 docs/interop/qmp-intro.txt
 rename docs/interop/{qmp-spec.txt => qmp-spec.rst} (56%)

-- 
2.39.2
Re: [PULL v2 0/4] QAPI patches patches for 2023-05-17
Posted by Richard Henderson 11 months, 2 weeks ago
On 5/22/23 04:20, Markus Armbruster wrote:
> The following changes since commit aa222a8e4f975284b3f8f131653a4114b3d333b3:
> 
>    Merge tag 'for_upstream' ofhttps://git.kernel.org/pub/scm/virt/kvm/mst/qemu  into staging (2023-05-19 12:17:16 -0700)
> 
> are available in the Git repository at:
> 
>    https://repo.or.cz/qemu/armbru.git  tags/pull-qapi-2023-05-17-v2
> 
> for you to fetch changes up to 0ec4468f233c53eb854f204d105d965455deec51:
> 
>    docs/interop: Delete qmp-intro.txt (2023-05-22 10:22:29 +0200)
> 
> ----------------------------------------------------------------
> QAPI patches patches for 2023-05-17

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/8.1 as appropriate.


r~