diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-07-19 13:05:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-07-19 13:05:06 +0100 |
| commit | da7da9d5e608200ecc0749ff37be246e9cd3314f (patch) | |
| tree | 18a7ed5f1e57dab0b5bd9e86337bbdcab1b84c75 /docs | |
| parent | f9d9fff72eed03acde97ea2d66104748dc474b2e (diff) | |
| parent | 9b0ecfaba5920ddf8601d7b31746a428aa3779c6 (diff) | |
| download | qemu-da7da9d5e608200ecc0749ff37be246e9cd3314f.zip qemu-da7da9d5e608200ecc0749ff37be246e9cd3314f.tar.gz qemu-da7da9d5e608200ecc0749ff37be246e9cd3314f.tar.bz2 | |
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 'docs')
| -rw-r--r-- | docs/devel/submitting-a-patch.rst | 2 | ||||
| -rw-r--r-- | docs/tools/qemu-nbd.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-patch.rst index 09a8d12..fec33ce 100644 --- a/docs/devel/submitting-a-patch.rst +++ b/docs/devel/submitting-a-patch.rst @@ -39,7 +39,7 @@ ideas from other posts. If you do subscribe, be prepared for a high volume of email, often over one thousand messages in a week. The list is moderated; first-time posts from an email address (whether or not you subscribed) may be subject to some delay while waiting for a moderator -to whitelist your address. +to allow your address. The larger your contribution is, or if you plan on becoming a long-term contributor, then the more important the rest of this page becomes. diff --git a/docs/tools/qemu-nbd.rst b/docs/tools/qemu-nbd.rst index 8e08a29..faf6349 100644 --- a/docs/tools/qemu-nbd.rst +++ b/docs/tools/qemu-nbd.rst @@ -225,7 +225,7 @@ disconnects: qemu-nbd -f qcow2 file.qcow2 Start a long-running server listening with encryption on port 10810, -and whitelist clients with a specific X.509 certificate to connect to +and allow clients with a specific X.509 certificate to connect to a 1 megabyte subset of a raw file, using the export name 'subset': :: |