diff mbox series

target/arm: Fix in_debug path in S1_ptw_translate

Message ID 20230114054605.2977022-1-richard.henderson@linaro.org
State Superseded
Headers show
Series target/arm: Fix in_debug path in S1_ptw_translate | expand

Commit Message

Richard Henderson Jan. 14, 2023, 5:46 a.m. UTC 
During the conversion, the test against get_phys_addr_lpae got inverted,
meaning that successful translations went to the 'failed' label.

Cc: qemu-stable@nongnu.org
Fixes: f3639a64f60 ("target/arm: Use softmmu tlbs for page table walking")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1417
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/arm/ptw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Peter Maydell Jan. 17, 2023, 4:35 p.m. UTC | #1 
On Sat, 14 Jan 2023 at 05:47, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> During the conversion, the test against get_phys_addr_lpae got inverted,
> meaning that successful translations went to the 'failed' label.
>
> Cc: qemu-stable@nongnu.org
> Fixes: f3639a64f60 ("target/arm: Use softmmu tlbs for page table walking")
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1417
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  target/arm/ptw.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)



Applied to target-arm.next, thanks.

-- PMM
diff mbox series

Patch

diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index 4bda0590c7..57f3615a66 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -238,8 +238,8 @@  static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw,
             };
             GetPhysAddrResult s2 = { };
 
-            if (!get_phys_addr_lpae(env, &s2ptw, addr, MMU_DATA_LOAD,
-                                    false, &s2, fi)) {
+            if (get_phys_addr_lpae(env, &s2ptw, addr, MMU_DATA_LOAD,
+                                   false, &s2, fi)) {
                 goto fail;
             }
             ptw->out_phys = s2.f.phys_addr;