motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

accel/tcg: Move user-only tlb_vaddr_to_host out of line

Browse source 
At the same time, fix a mis-match between user and system
by using vaddr not abi_ptr for the address parameter.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2025-04-30 16:54:31 -07:00
parent d551b822f7
commit 9b74d403b3
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
accel/tcg/user-exec.c
View file

@ -850,6 +850,12 @@ void *probe_access(CPUArchState *env, vaddr addr, int size,
return size ? g2h(env_cpu(env), addr) : NULL; return size ? g2h(env_cpu(env), addr) : NULL;
} }
void *tlb_vaddr_to_host(CPUArchState *env, vaddr addr,
MMUAccessType access_type, int mmu_idx)
{
return g2h(env_cpu(env), addr);
}
tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, vaddr addr, tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, vaddr addr,
void **hostp) void **hostp)
{ {

8
include/accel/tcg/cpu-ldst.h
View file

@ -515,15 +515,7 @@ static inline uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr)
* Otherwise (TLB entry is for an I/O access, guest software * Otherwise (TLB entry is for an I/O access, guest software
* TLB fill required, etc) return NULL. * TLB fill required, etc) return NULL.
*/ */
#ifdef CONFIG_USER_ONLY
static inline void *tlb_vaddr_to_host(CPUArchState *env, abi_ptr addr,
MMUAccessType access_type, int mmu_idx)
{
return g2h(env_cpu(env), addr);
}
#else
void *tlb_vaddr_to_host(CPUArchState *env, vaddr addr, void *tlb_vaddr_to_host(CPUArchState *env, vaddr addr,
MMUAccessType access_type, int mmu_idx); MMUAccessType access_type, int mmu_idx);
#endif
#endif /* ACCEL_TCG_CPU_LDST_H */ #endif /* ACCEL_TCG_CPU_LDST_H */