Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: qemu/qemu
base: 37246d54d656
Choose a base ref
...
head repository: qemu/qemu
compare: 886c0453cbf1
Choose a head ref
  • 5 commits
  • 12 files changed
  • 3 contributors

Commits on May 22, 2023

  1. qapi: Improve error message for description following section

    The error message is bad when the section is untagged.  For instance,
    test case doc-interleaved-section produces "'@foobar:' can't follow
    'Note' section", which is okay, but if we drop the "Note:" tag, we get
    "'@foobar:' can't follow 'None' section, which is bad.
    
    Change the error message to "description of '@foobar:' follows a
    section".
    
    Signed-off-by: Markus Armbruster <armbru@redhat.com>
    Message-Id: <20230510141637.3685080-1-armbru@redhat.com>
    Reviewed-by: Juan Quintela <quintela@redhat.com>
    [Conflict with commit 3e32dca resolved]
    Markus Armbruster committed May 22, 2023
    Copy the full SHA
    290e48e View commit details
    Browse the repository at this point in the history
  2. docs/interop: Convert qmp-spec.txt to rST

    Convert the qmp-spec.txt document to restructuredText.
    Notable points about the conversion:
     * numbers at the start of section headings are removed, to match
       the style of the rest of the manual
     * cross-references to other sections or documents are hyperlinked
     * various formatting tweaks (notably the examples, which need the
       -> and <- prefixed so the QMP code-block lexer will accept them)
     * English prose fixed in a few places
    
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Message-Id: <20230515162245.3964307-2-peter.maydell@linaro.org>
    Reviewed-by: Markus Armbruster <armbru@redhat.com>
    Signed-off-by: Markus Armbruster <armbru@redhat.com>
    [.. code-block:: dumbed down to :: to work around CI failure]
    pm215 authored and Markus Armbruster committed May 22, 2023
    Copy the full SHA
    d565725 View commit details
    Browse the repository at this point in the history
  3. docs/interop/qmp-spec: Update error description for parsing errors

    The description text for a parsing error has changed since the
    spec doc was first written; update the example in the docs.
    
    Suggested-by: Markus Armbruster <armbru@redhat.com>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Message-Id: <20230515162245.3964307-3-peter.maydell@linaro.org>
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Reviewed-by: Markus Armbruster <armbru@redhat.com>
    Signed-off-by: Markus Armbruster <armbru@redhat.com>
    pm215 authored and Markus Armbruster committed May 22, 2023
    Copy the full SHA
    8a85b8e View commit details
    Browse the repository at this point in the history
  4. docs/interop: Delete qmp-intro.txt

    qmp-intro.txt is quite small and provides very little information
    that isn't already in the documentation elsewhere.  Fold the example
    command lines into qemu-options.hx, and delete the now-unneeded plain
    text document.
    
    While we're touching the qemu-options.hx documentation text,
    wordsmith it a little bit and improve the rST formatting.
    
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Reviewed-by: Markus Armbruster <armbru@redhat.com>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Message-Id: <20230515162245.3964307-4-peter.maydell@linaro.org>
    Reviewed-by: Markus Armbruster <armbru@redhat.com>
    Signed-off-by: Markus Armbruster <armbru@redhat.com>
    pm215 authored and Markus Armbruster committed May 22, 2023
    Copy the full SHA
    0ec4468 View commit details
    Browse the repository at this point in the history
  5. Merge tag 'pull-qapi-2023-05-17-v2' of https://repo.or.cz/qemu/armbru

    …into staging
    
    QAPI patches patches for 2023-05-17
    
    # -----BEGIN PGP SIGNATURE-----
    #
    # iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmRrTcgSHGFybWJydUBy
    # ZWRoYXQuY29tAAoJEDhwtADrkYZTMycP/3sP6/U4kwOKMGGcB+n2pHJeioQS4xgF
    # 94NCW+KpewxApP0XzIC2nDGjUe/rPcUfQmBNUumvYbqHO91tq91wFwkllBv2UR0q
    # 6qfRji+e8+9H9hMDeVzzSNjlZZg/tSdIJlhkJDw1u4/3fpjfAmzVx6DO3wepSQ9Q
    # m5Af/+uhVZWyUXMZqcKr2Zq8qur6ZFEBNpXpPvT60Tvy2heuQ+vcoE3tl2ZRQbmj
    # b/jhtCu+NPjgOHtg9Gr2BPXqQiZBR4vFA7WBsB8wCf2xxULfTwHJvFz/e0vx5fUC
    # q0Fsyybf4USo2PRMsRFv2v4dEuVGHb3E1RIJY4NTAxQMqqm4zfOyK0BzOGNDkxCn
    # owNP4vKly0e/CfYDY74FHaPId295xyeo6S4Cj5ib9W23AAWUNt6f6vbjlDOLCLON
    # c7yXP/aJwhTb2w1t0mLTmsKum3DpLlrudPudTylVlmYfwchkvUGsWYbaxu6H6XWk
    # 49Ox/QPVwqG6elXNn3kTY4QqTAppXhE7QcPbioX9WOThVPf6aJCLdZSHEHu4HXkZ
    # 4FRu73Z2wcPNB789xOrQoXs24GdKmWXQ6K01KC4v7WNJQBXccec52yGxvktQRZBm
    # GL3zYdOOJEL+Y/8JrXTIo26M8HP/4kxV2VqB6KOuaGygMsW9w9jbG+ygLyjqUDQg
    # 3APV3hdmVOht
    # =6anf
    # -----END PGP SIGNATURE-----
    # gpg: Signature made Mon 22 May 2023 04:11:04 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-v2' of https://repo.or.cz/qemu/armbru:
      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>
    rth7680 committed May 22, 2023
    Copy the full SHA
    886c045 View commit details
    Browse the repository at this point in the history