diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-07-24 19:10:58 +1000 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-07-24 19:10:58 +1000 |
| commit | 5fcc25d5e3ce1d470f3db6bcb163185901f4cfe9 (patch) | |
| tree | bcbf7d3dec04d8bbf325e2db1b1e4b6b103924b2 | |
| parent | 6410f877f5ed535acd01bbfaa4baec379e44d0ef (diff) | |
| parent | a18ffbcf8b9fabfc6c850ebb1d3e40a21b885c67 (diff) | |
| download | qemu-5fcc25d5e3ce1d470f3db6bcb163185901f4cfe9.zip qemu-5fcc25d5e3ce1d470f3db6bcb163185901f4cfe9.tar.gz qemu-5fcc25d5e3ce1d470f3db6bcb163185901f4cfe9.tar.bz2 | |
Merge tag 'pull-loongarch-20240724' of https://gitlab.com/gaosong/qemu into staging
Fix for 9.1
# -----BEGIN PGP SIGNATURE-----
#
# iLMEAAEKAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCZqDBEQAKCRBAov/yOSY+
# 3/3nA/9xWl3qkj95WmBICIi/K9doeA54k1h4d7g/K8+UHV+hDIlEDoidgesJSveH
# RmnE6wmJTb6QhT4IQrO5ERwE5U5DqINDhxAcX5GLfBjEtTFbLCYqEaKlN8pNh6MR
# Qki+SGKSa50kxAMgcB6vkld9uTIWczXzMTb3IxGCWs4VKPhJYw==
# =y//7
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 24 Jul 2024 06:53:37 PM AEST
# gpg: using RSA key B8FF1DA0D2FDCB2DA09C6C2C40A2FFF239263EDF
# gpg: Good signature from "Song Gao <m17746591750@163.com>" [unknown]
# 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: B8FF 1DA0 D2FD CB2D A09C 6C2C 40A2 FFF2 3926 3EDF
* tag 'pull-loongarch-20240724' of https://gitlab.com/gaosong/qemu:
target/loongarch: Fix helper_lddir() a CID INTEGER_OVERFLOW issue
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | target/loongarch/tcg/tlb_helper.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/loongarch/tcg/tlb_helper.c b/target/loongarch/tcg/tlb_helper.c index d6331f9..97f38fc 100644 --- a/target/loongarch/tcg/tlb_helper.c +++ b/target/loongarch/tcg/tlb_helper.c @@ -525,6 +525,7 @@ target_ulong helper_lddir(CPULoongArchState *env, target_ulong base, if (unlikely(level == 4)) { qemu_log_mask(LOG_GUEST_ERROR, "Attempted use of level 4 huge page\n"); + return base; } if (FIELD_EX64(base, TLBENTRY, LEVEL)) { |