diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-02-22 12:42:52 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-02-22 12:42:52 +0000 |
| commit | 6630bc04bccadcf868165ad6bca5a964bb69b067 (patch) | |
| tree | 59c4c5667b7c4731d4d96dcab194232b5e768fc8 /tests/avocado/mem-addr-space-check.py | |
| parent | 5cd3ae4903e33982e7a9bbd04674af517e796d6e (diff) | |
| parent | 185311130f54ead75c407cdf83004d575829b5d2 (diff) | |
Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging
trivial patches for 2024-02-22
# -----BEGIN PGP SIGNATURE-----
#
# iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmXXLtwPHG1qdEB0bHMu
# bXNrLnJ1AAoJEHAbT2saaT5ZKH0H/0qdQXdoc/ZTdAtUPFJGhEc6KMeOO1w9928w
# OSOB7w4dJiKt6I53WtmY9f2+7/CMJHyscV3xlClRaaZeJVFzgwOo8Wjqkmwa8uOw
# Nl5GcL2egBPuY7Ucc1eNIj/I4RbS1pX5vURkUfTG3AH1SEbFAv9Gk6qBtrmer2YA
# hg2DdCskvPd8EOovx3sWQRH+Ra4w3hxaAELS9sa9ZKLBAaYvucYan9IjLaJqSY84
# b441QXu3ht/DpLw6d/HDWUqwYUOJD0HUhPSvba1xCsrzQVXFE7VhR5O/cDrqs2qm
# 2fcMW6j62raPdK1u77WaRdslPy34YUmjk7lwZ8wiS7fmDx0Aqcg=
# =0va1
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 22 Feb 2024 11:24:12 GMT
# gpg: using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59
# gpg: issuer "mjt@tls.msk.ru"
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [full]
# gpg: aka "Michael Tokarev <mjt@corpit.ru>" [full]
# gpg: aka "Michael Tokarev <mjt@debian.org>" [full]
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu: (34 commits)
system/vl: Update description for input grab key
docs/system: Update description for input grab key
hw/hppa/Kconfig: Fix building with "configure --without-default-devices"
target/sparc: correct typos
s390x: correct typos
m68k: correct typos
hexagon: correct typos
ci/gitlab-pipeline-status: correct typos
qemu-options.hx: correct typos
qapi/ui: correct typos
pc-bios/README: correct typos
hw/riscv/virt.h: correct typos
hw/net/npcm_gmac.h: correct typos
hw/cxl/cxl_device.h: correct typos
hw/arm/omap.h: correct typos
include/exec/memory.h: correct typos
sh4: correct typos
ppc: correct typos
loongson3: correct typos
accel/tcg: correct typos
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/avocado/mem-addr-space-check.py')
| -rw-r--r-- | tests/avocado/mem-addr-space-check.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/avocado/mem-addr-space-check.py b/tests/avocado/mem-addr-space-check.py index 363c3f12a6..af019969c0 100644 --- a/tests/avocado/mem-addr-space-check.py +++ b/tests/avocado/mem-addr-space-check.py @@ -165,7 +165,7 @@ class MemAddrCheck(QemuSystemTest): For q35-7.0 machines, "above 4G" memory starts are 4G. pci64_hole size is 32 GiB. Since TCG_PHYS_ADDR_BITS is defined to be 40, TCG emulated CPUs have maximum of 1 TiB (1024 GiB) of - directly addressible memory. + directly addressable memory. Hence, maxmem value at most can be 1024 GiB - 4 GiB - 1 GiB per slot for alignment - 32 GiB + 0.5 GiB which is equal to 987.5 GiB. Setting the value to 988 GiB should @@ -190,7 +190,7 @@ class MemAddrCheck(QemuSystemTest): AMD_HT_START is defined to be at 1012 GiB. So for q35 machines version > 7.0 and AMD cpus, instead of 1024 GiB limit for 40 bit processor address space, it has to be 1012 GiB , that is 12 GiB - less than the case above in order to accomodate HT hole. + less than the case above in order to accommodate HT hole. Make sure QEMU fails when maxmem size is 976 GiB (12 GiB less than 988 GiB). """ @@ -297,7 +297,7 @@ class MemAddrCheck(QemuSystemTest): :avocado: tags=arch:x86_64 AMD processor with 41 bits. Max cpu hw address = 2 TiB. - Same as above but by setting maxram beween 976 GiB and 992 Gib, + Same as above but by setting maxram between 976 GiB and 992 Gib, QEMU should start fine. """ self.vm.add_args('-S', '-cpu', 'EPYC-v4,phys-bits=41', |