[Stable-7.2.7,47/62] target/arm: Don't access TCG code when debugging with KVM

Commit Message

Michael Tokarev Nov. 9, 2023, 1:59 p.m. UTC

From: Fabiano Rosas <[e-mail]>

When TCG is disabled this part of the code should not be reachable, so
wrap it with an ifdef for now.

Signed-off-by: Fabiano Rosas <[e-mail]>
Reviewed-by: Richard Henderson <[e-mail]>
Tested-by: Philippe Mathieu-Daudé <[e-mail]>
Signed-off-by: Peter Maydell <[e-mail]>
(cherry picked from commit 0d3de77a07f4f774f7a9248afa8ea497ad5f2ae5)
Signed-off-by: Michael Tokarev <[e-mail]>
(Mjt: trivial change which makes two subsequent cherry-picks to apply cleanly)

Patch

diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index 0b16068557..fa013044c1 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -254,6 +254,7 @@  static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw,
         ptw->out_host = NULL;
         ptw->out_rw = false;
     } else {
+#ifdef CONFIG_TCG
         CPUTLBEntryFull *full;
         int flags;
 
@@ -270,6 +271,9 @@  static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw,
         ptw->out_rw = full->prot & PAGE_WRITE;
         pte_attrs = full->pte_attrs;
         pte_secure = full->attrs.secure;
+#else
+        g_assert_not_reached();
+#endif
     }
 
     if (regime_is_stage2(s2_mmu_idx)) {