diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2025-04-30 16:54:31 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2025-05-05 09:24:10 -0700 |
| commit | 9b74d403b30e64256b4b94cbc01c76a0382ca5e8 (patch) | |
| tree | ca8f5af9ffbd5265769495ad6fd828205e555a7a | |
| parent | d551b822f7ac329c763267659950992849d7e735 (diff) | |
| download | qemu-9b74d403b30e64256b4b94cbc01c76a0382ca5e8.zip qemu-9b74d403b30e64256b4b94cbc01c76a0382ca5e8.tar.gz qemu-9b74d403b30e64256b4b94cbc01c76a0382ca5e8.tar.bz2 | |
accel/tcg: Move user-only tlb_vaddr_to_host out of line
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>
| -rw-r--r-- | accel/tcg/user-exec.c | 6 | ||||
| -rw-r--r-- | include/accel/tcg/cpu-ldst.h | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index e1f4c4e..adc5296 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -850,6 +850,12 @@ void *probe_access(CPUArchState *env, vaddr addr, int size, 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, void **hostp) { diff --git a/include/accel/tcg/cpu-ldst.h b/include/accel/tcg/cpu-ldst.h index 44a62b5..00e6419 100644 --- a/include/accel/tcg/cpu-ldst.h +++ b/include/accel/tcg/cpu-ldst.h @@ -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 * 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, MMUAccessType access_type, int mmu_idx); -#endif #endif /* ACCEL_TCG_CPU_LDST_H */ |