SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

accel/tcg: Have tlb_vaddr_to_host() use vaddr type

Browse Source 
abi_ptr is expected to be used in user emulation.
tlb_vaddr_to_host() uses it, but can be used in
system emulation. Replace the type by 'vaddr' which
is equivalent on user emulation but also works on
system.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20241114011310.3615-13-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-11-13 08:29:44 +01:00
parent ea77480146
commit 9c6e54f475
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accel/tcg/cputlb.c
View File

@ -1504,7 +1504,7 @@ void *probe_access(CPUArchState *env, vaddr addr, int size,
return host; return host;
} }
void *tlb_vaddr_to_host(CPUArchState *env, abi_ptr addr, void *tlb_vaddr_to_host(CPUArchState *env, vaddr addr,
MMUAccessType access_type, int mmu_idx) MMUAccessType access_type, int mmu_idx)
{ {
CPUTLBEntryFull *full; CPUTLBEntryFull *full;

3
include/exec/cpu_ldst.h
View File

@ -67,6 +67,7 @@
#endif #endif
#include "exec/memopidx.h" #include "exec/memopidx.h"
#include "exec/vaddr.h"
#include "exec/abi_ptr.h" #include "exec/abi_ptr.h"
#include "exec/mmu-access-type.h" #include "exec/mmu-access-type.h"
#include "qemu/int128.h" #include "qemu/int128.h"
@ -375,7 +376,7 @@ static inline void *tlb_vaddr_to_host(CPUArchState *env, abi_ptr addr,
return g2h(env_cpu(env), addr); return g2h(env_cpu(env), addr);
} }
#else #else
void *tlb_vaddr_to_host(CPUArchState *env, abi_ptr addr, void *tlb_vaddr_to_host(CPUArchState *env, vaddr addr,
MMUAccessType access_type, int mmu_idx); MMUAccessType access_type, int mmu_idx);
#endif #endif