* [Qemu-devel] [PATCH] Fix tlb_vaddr_to_host with CONFIG_USER_ONLY
@ 2016-09-21 21:21 Benjamin Herrenschmidt
2016-09-22 7:51 ` Laurent Vivier
0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2016-09-21 21:21 UTC (permalink / raw)
To: qemu-devel
We use the wrong argument name for the g2h() macro !
The result ends up being something like (target_ulong)(uint64) + guest_base
which is obviously wrong.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
include/exec/cpu_ldst.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index b573df5..6eb5fe8 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -401,7 +401,7 @@ static inline void *tlb_vaddr_to_host(CPUArchState *env, target_ulong addr,
int access_type, int mmu_idx)
{
#if defined(CONFIG_USER_ONLY)
- return g2h(vaddr);
+ return g2h(addr);
#else
int index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
CPUTLBEntry *tlbentry = &env->tlb_table[mmu_idx][index];
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH] Fix tlb_vaddr_to_host with CONFIG_USER_ONLY
2016-09-21 21:21 [Qemu-devel] [PATCH] Fix tlb_vaddr_to_host with CONFIG_USER_ONLY Benjamin Herrenschmidt
@ 2016-09-22 7:51 ` Laurent Vivier
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Vivier @ 2016-09-22 7:51 UTC (permalink / raw)
To: Benjamin Herrenschmidt, qemu-devel
Cc: Aurelien Jarno, Andreas Färber, Paolo Bonzini,
Peter Crosthwaite, Richard Henderson, Peter Maydell
On 21/09/2016 23:21, Benjamin Herrenschmidt wrote:
> We use the wrong argument name for the g2h() macro !
>
> The result ends up being something like (target_ulong)(uint64) + guest_base
> which is obviously wrong.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Tested-by; Laurent Vivier <lvivier@redhat.com>
Your original mail has the R-b from pmaydell, my duplicate patch from
aurel32.
And according to get_maintainer script, maintainers are: pbonzini,
crosthwaite.peter, rth@twiddle.net
Thanks,
Laurent
> ---
> include/exec/cpu_ldst.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
> index b573df5..6eb5fe8 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -401,7 +401,7 @@ static inline void *tlb_vaddr_to_host(CPUArchState *env, target_ulong addr,
> int access_type, int mmu_idx)
> {
> #if defined(CONFIG_USER_ONLY)
> - return g2h(vaddr);
> + return g2h(addr);
> #else
> int index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
> CPUTLBEntry *tlbentry = &env->tlb_table[mmu_idx][index];
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-22 7:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-21 21:21 [Qemu-devel] [PATCH] Fix tlb_vaddr_to_host with CONFIG_USER_ONLY Benjamin Herrenschmidt
2016-09-22 7:51 ` Laurent Vivier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).