From: Richard Henderson <richard.henderson@linaro.org>
Date: Fri, 7 Apr 2023 18:51:49 +0000 (-0700)
Subject: target/arm: Copy guarded bit in combine_cacheattrs
X-Git-Tag: v8.0.0-rc4~8^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8539dc00552e8ea60420856fc1262c8299bc6308;p=thirdparty%2Fqemu.git

target/arm: Copy guarded bit in combine_cacheattrs

The guarded bit comes from the stage1 walk.

Fixes: Coverity CID 1507929
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20230407185149.3253946-3-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index 58a6de09bc9..6d72950a795 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -2576,6 +2576,7 @@ static ARMCacheAttrs combine_cacheattrs(uint64_t hcr,
 
     assert(!s1.is_s2_format);
     ret.is_s2_format = false;
+    ret.guarded = s1.guarded;
 
     if (s1.attrs == 0xf0) {
         tagged = true;