diff options
| author | Peter Maydell | 2022-07-19 14:05:06 +0200 |
|---|---|---|
| committer | Peter Maydell | 2022-07-19 14:05:06 +0200 |
| commit | da7da9d5e608200ecc0749ff37be246e9cd3314f (patch) | |
| tree | 18a7ed5f1e57dab0b5bd9e86337bbdcab1b84c75 /python/qemu | |
| parent | Merge tag 'qemu-sparc-20220718' of https://github.com/mcayland/qemu into staging (diff) | |
| parent | python/qemu/qmp/legacy: Replace 'returns-whitelist' with the correct type (diff) | |
| download | qemu-da7da9d5e608200ecc0749ff37be246e9cd3314f.tar.gz qemu-da7da9d5e608200ecc0749ff37be246e9cd3314f.tar.xz qemu-da7da9d5e608200ecc0749ff37be246e9cd3314f.zip | |
Merge tag 'pull-request-2022-07-19' of https://gitlab.com/thuth/qemu into staging
* Clean up tests/vm (remove obsolte VMs, upgrade Ubuntu 18.04 to 20.04 etc.)
* Fix broken build on Haiku
* Replace the term 'whitelist' in some files with a better one
* Some other minor test related fixes
# gpg: Signature made Tue 19 Jul 2022 07:55:26 BST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* tag 'pull-request-2022-07-19' of https://gitlab.com/thuth/qemu:
python/qemu/qmp/legacy: Replace 'returns-whitelist' with the correct type
util: Fix broken build on Haiku
Replace 'whitelist' with 'allow'
tests/unit: Replace g_memdup() by g_memdup2()
qtest/machine-none: Add LoongArch support
tests/vm: Remove docker cross-compile test from CentOS VM
tests/vm: add 1GB extra memory per core
tests/vm: remove duplicate 'centos' VM test
tests/vm: remove ubuntu.i386 VM test
tests/vm: upgrade Ubuntu 18.04 VM to 20.04
tests/vm: switch centos.aarch64 to CentOS 8 Stream
tests/vm: switch CentOS 8 to CentOS 8 Stream
tests/vm: use 'cp' instead of 'ln' for temporary vm images
qga: treat get-guest-fsinfo as "best effort"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'python/qemu')
| -rw-r--r-- | python/qemu/qmp/legacy.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py index 03b5574618..1951754455 100644 --- a/python/qemu/qmp/legacy.py +++ b/python/qemu/qmp/legacy.py @@ -50,7 +50,7 @@ QMPObject = Dict[str, object] # QMPMessage can be outgoing commands or incoming events/returns. # QMPReturnValue is usually a dict/json object, but due to QAPI's -# 'returns-whitelist', it can actually be anything. +# 'command-returns-exceptions', it can actually be anything. # # {'return': {}} is a QMPMessage, # {} is the QMPReturnValue. |