diff --git a/0039-Fix-tlb_vaddr_to_host-with-CONFIG_U.patch b/0039-Fix-tlb_vaddr_to_host-with-CONFIG_U.patch new file mode 100644 index 0000000..15a2698 --- /dev/null +++ b/0039-Fix-tlb_vaddr_to_host-with-CONFIG_U.patch @@ -0,0 +1,32 @@ +From 803968c258e59d2af30618b736c87b114c2038f1 Mon Sep 17 00:00:00 2001 +From: Benjamin Herrenschmidt +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 +Reviewed-by: Peter Maydell +Reviewed-by: Laurent Vivier +Tested-by: Laurent Vivier +Signed-off-by: Andreas Färber +--- + 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]; diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index a198dd7..1fa6b93 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 22 15:04:48 UTC 2016 - afaerber@suse.de + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.7 +* Fix ppc test failure + 0039-Fix-tlb_vaddr_to_host-with-CONFIG_U.patch + ------------------------------------------------------------------- Wed Sep 21 13:55:35 UTC 2016 - afaerber@suse.de diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index c244afb..44013bf 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -63,6 +63,7 @@ Patch0035: 0035-qemu-bridge-helper-reduce-security-.patch Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch Patch0038: 0038-linux-user-properly-test-for-infini.patch +Patch0039: 0039-Fix-tlb_vaddr_to_host-with-CONFIG_U.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: qemu-rpmlintrc @@ -154,6 +155,7 @@ run cross-architecture builds. %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 +%patch0039 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 571209b..f9ac35f 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 22 15:04:43 UTC 2016 - afaerber@suse.de + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.7 +* Patches added: + 0039-Fix-tlb_vaddr_to_host-with-CONFIG_U.patch + ------------------------------------------------------------------- Wed Sep 21 13:24:20 UTC 2016 - afaerber@suse.de diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index e538120..25ab756 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -125,6 +125,7 @@ Patch0035: 0035-qemu-bridge-helper-reduce-security-.patch Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch Patch0038: 0038-linux-user-properly-test-for-infini.patch +Patch0039: 0039-Fix-tlb_vaddr_to_host-with-CONFIG_U.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -743,6 +744,7 @@ This package provides a service file for starting and stopping KSM. %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 +%patch0039 -p1 %if %{build_x86_fw_from_source} pushd roms/seabios diff --git a/qemu.changes b/qemu.changes index 571209b..f9ac35f 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 22 15:04:43 UTC 2016 - afaerber@suse.de + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.7 +* Patches added: + 0039-Fix-tlb_vaddr_to_host-with-CONFIG_U.patch + ------------------------------------------------------------------- Wed Sep 21 13:24:20 UTC 2016 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 9f4afd4..c25978e 100644 --- a/qemu.spec +++ b/qemu.spec @@ -125,6 +125,7 @@ Patch0035: 0035-qemu-bridge-helper-reduce-security-.patch Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch Patch0038: 0038-linux-user-properly-test-for-infini.patch +Patch0039: 0039-Fix-tlb_vaddr_to_host-with-CONFIG_U.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -743,6 +744,7 @@ This package provides a service file for starting and stopping KSM. %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 +%patch0039 -p1 %if %{build_x86_fw_from_source} pushd roms/seabios