Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge tag 'pull-qapi-2023-05-17' of https://repo.or.cz/qemu/armbru in…
…to staging

QAPI patches patches for 2023-05-17

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmRk24kSHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTFKMP/isne+7NXJHeiXktbODgegKlshzaT2eq
# K+NUh0UDWVpV2h46c7PjZmwBO2iTwLZPReI1TY8Jghf9fmzrW0d0+oz9+L1ZxzrY
# ScKq0ThnjMJqXifxeIe4hExfHCDcSu8WHOHwNVRVy4Kqrn1fEivilYigTOGFljCb
# H7nuszJTGPcM80ncA5JY+R3+tng54YpMjOLaM8kXpy8PHPs3dSVq9bYtWuiHBPVl
# htYPix8QK0rMAzPquLHm7bBse9IWHowrzZuoKvMgBoeAUKXBJYkyo9MoDBNOI2+x
# 8PkEjFRJYkr+RM6LF4niM+bvTypbSwF8Y6vUqJtc0jkCTzAnkRh9YXVPbhr6OgS0
# fdOQz/ag4LJ6jyeATTLuxm3xa+yp4dv+if6G2Bgw3RCCuzStZvdGqYJ0/oENpHf6
# +MqDgWf1Df75VjOSdnj7jfDLGCZopNYkXz0arS8jv0TMNfunEj44v3wzJK2duVLP
# lkM86falSdbgct/KEn1ceIXG3gX21yIlpRpLTTFERyoVYVGAP2ac83djjsV/02Vk
# 8psixHWlj/aVAgVOn2ljo5yuoO5Xj5L6XUeObavRMmDtHj83X4emDEfHtxQRU6Ug
# EWTt7sA/7Z2I0MdDvgOOYRyAT1jMnTqZV/r7nPhwOxd5sFXso3IkCvQ3wqPvgzje
# H7d6sCaoZd9N
# =np3P
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 17 May 2023 06:50:01 AM PDT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [undefined]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-qapi-2023-05-17' of https://repo.or.cz/qemu/armbru:
  qapi/parser: Drop two bad type hints for now
  docs/interop: Delete qmp-intro.txt
  docs/interop/qmp-spec: Update error description for parsing errors
  docs/interop: Convert qmp-spec.txt to rST
  qapi: Improve error message for description following section

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
rth7680 committed May 17, 2023
2 parents 19200a0 + 28d2a4f commit c7d0bdd
Show file tree
Hide file tree
Showing 12 changed files with 224 additions and 260 deletions.
3 changes: 2 additions & 1 deletion docs/devel/qapi-code-gen.rst
Expand Up @@ -545,7 +545,8 @@ Member 'allow-oob' declares whether the command supports out-of-band
{ 'command': 'migrate_recover',
'data': { 'uri': 'str' }, 'allow-oob': true }
See qmp-spec.txt for out-of-band execution syntax and semantics.
See the :doc:`/interop/qmp-spec` for out-of-band execution syntax
and semantics.
Commands supporting out-of-band execution can still be executed
in-band.
Expand Down
1 change: 1 addition & 0 deletions docs/interop/index.rst
Expand Up @@ -15,6 +15,7 @@ are useful for making QEMU interoperate with other software.
dbus-display
live-block-operations
pr-helper
qmp-spec
qemu-ga
qemu-ga-ref
qemu-qmp-ref
Expand Down
88 changes: 0 additions & 88 deletions docs/interop/qmp-intro.txt

This file was deleted.

0 comments on commit c7d0bdd

Please sign in to comment.