From: Richard Henderson <richard.henderson@linaro.org>
Date: Thu, 23 Feb 2023 03:08:51 +0000 (-1000)
Subject: accel/tcg: Retain prot flags from tlb_fill
X-Git-Tag: qemu-xen-4.18.0-rc5~288^2~79
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=20f7fe93f59fd840b06de2341f789725e382902b;p=qemu-xen.git

accel/tcg: Retain prot flags from tlb_fill

While changes are made to prot within tlb_set_page_full, they are
an implementation detail of softmmu.  Retain the original for any
target use of probe_access_full.

Fixes: 4047368938f6 ("accel/tcg: Introduce tlb_set_page_full")
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 008ae7a66d..deafcc7f15 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -1250,7 +1250,6 @@ void tlb_set_page_full(CPUState *cpu, int mmu_idx,
     desc->fulltlb[index] = *full;
     desc->fulltlb[index].xlat_section = iotlb - vaddr_page;
     desc->fulltlb[index].phys_addr = paddr_page;
-    desc->fulltlb[index].prot = prot;
 
     /* Now calculate the new entry */
     tn.addend = addend - vaddr_page;