From: Richard Henderson <richard.henderson@linaro.org>
Date: Wed, 4 Sep 2019 00:03:12 +0000 (-0700)
Subject: cputlb: Fix tlb_vaddr_to_host
X-Git-Tag: v4.2.0-rc0~29^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7f445c8c7aad0d8fca7d99a48cc8118dc82aa0f3;p=users%2Fdwmw2%2Fqemu.git

cputlb: Fix tlb_vaddr_to_host

Using uintptr_t instead of target_ulong meant that, for 64-bit guest
and 32-bit host, we truncated the guest address comparator and so may
not hit the tlb when we should.

Fixes: 4811e9095c0
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 6f4194df96..5eebddcca8 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -1189,7 +1189,7 @@ void *tlb_vaddr_to_host(CPUArchState *env, abi_ptr addr,
                         MMUAccessType access_type, int mmu_idx)
 {
     CPUTLBEntry *entry = tlb_entry(env, mmu_idx, addr);
-    uintptr_t tlb_addr, page;
+    target_ulong tlb_addr, page;
     size_t elt_ofs;
 
     switch (access_type) {