e38c41b04c
Incomplete attempt to fix ppc-linux-user test failure OBS-URL: https://build.opensuse.org/request/show/430564 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=315
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 803968c258e59d2af30618b736c87b114c2038f1 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
|
Date: Wed, 3 Aug 2016 13:15:06 +1000
|
|
Subject: [PATCH] Fix tlb_vaddr_to_host with CONFIG_USER_ONLY
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
We use the wrong argument name for the g2h() macro !
|
|
|
|
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
|
|
Tested-by: Laurent Vivier <lvivier@redhat.com>
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
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];
|