Re: [PATCH v2 22/24] accel/tcg: Remove env_tlb()

[Philippe Mathieu-Daudé]

On 14/9/23 04:44, Richard Henderson wrote:
> From: Anton Johansson <anjo@rev.ng>
>
> The function is no longer used to access the TLB,
> and has been replaced by cpu->neg.tlb.
>
> Signed-off-by: Anton Johansson <anjo@rev.ng>
> Message-Id: <20230912153428.17816-9-anjo@rev.ng>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> [rth: Merge comment update patch]
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   include/exec/cpu-all.h       | 11 -----------
>   tcg/aarch64/tcg-target.c.inc |  2 +-
>   tcg/arm/tcg-target.c.inc     |  2 +-
>   3 files changed, 2 insertions(+), 13 deletions(-)

Missing:

-- >8 --
diff --cc accel/tcg/cputlb.c
index bb7dcb87af,08df68f03a..0000000000
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@@ -1746,7 -1734,7 +1734,7 @@@ bool tlb_plugin_lookup(CPUState *cpu, v
          /* We must have an iotlb entry for MMIO */
          if (tlb_addr & TLB_MMIO) {
              CPUTLBEntryFull *full;
-             full = &env_tlb(env)->d[mmu_idx].fulltlb[index];
++            full = &cpu->neg.tlb.d[mmu_idx].fulltlb[index];
              data->is_io = true;
              data->v.io.section =
                  iotlb_to_section(cpu, full->xlat_section, full->attrs);
---

(Noticed using --enable-plugins).