rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 430564 from home:a_faerber:branches:Virtualization

Browse Source 
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
This commit is contained in:
Andreas Färber 2016-09-27 13:43:15 +00:00 committed by Git OBS Bridge
parent 6981894d9a
commit e38c41b04c
7 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0039-Fix-tlb_vaddr_to_host-with-CONFIG_U.patch Normal file
View File

@ -0,0 +1,32 @@
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];

7
qemu-linux-user.changes
View File

@ -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 Wed Sep 21 13:55:35 UTC 2016 - afaerber@suse.de

2
qemu-linux-user.spec
View File

@ -63,6 +63,7 @@ Patch0035: 0035-qemu-bridge-helper-reduce-security-.patch
Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch
Patch0038: 0038-linux-user-properly-test-for-infini.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. # Please do not add patches manually here, run update_git.sh.
# this is to make lint happy # this is to make lint happy
Source300: qemu-rpmlintrc Source300: qemu-rpmlintrc
@ -154,6 +155,7 @@ run cross-architecture builds.
%patch0036 -p1 %patch0036 -p1
%patch0037 -p1 %patch0037 -p1
%patch0038 -p1 %patch0038 -p1
%patch0039 -p1
%build %build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

7
qemu-testsuite.changes
View File

@ -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 Wed Sep 21 13:24:20 UTC 2016 - afaerber@suse.de

2
qemu-testsuite.spec
View File

@ -125,6 +125,7 @@ Patch0035: 0035-qemu-bridge-helper-reduce-security-.patch
Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch
Patch0038: 0038-linux-user-properly-test-for-infini.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. # Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue. # 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 %patch0036 -p1
%patch0037 -p1 %patch0037 -p1
%patch0038 -p1 %patch0038 -p1
%patch0039 -p1
%if %{build_x86_fw_from_source} %if %{build_x86_fw_from_source}
pushd roms/seabios pushd roms/seabios

7
qemu.changes
View File

@ -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 Wed Sep 21 13:24:20 UTC 2016 - afaerber@suse.de

2
qemu.spec
View File

@ -125,6 +125,7 @@ Patch0035: 0035-qemu-bridge-helper-reduce-security-.patch
Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch Patch0036: 0036-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch Patch0037: 0037-configure-Fix-detection-of-seccomp-.patch
Patch0038: 0038-linux-user-properly-test-for-infini.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. # Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue. # 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 %patch0036 -p1
%patch0037 -p1 %patch0037 -p1
%patch0038 -p1 %patch0038 -p1
%patch0039 -p1
%if %{build_x86_fw_from_source} %if %{build_x86_fw_from_source}
pushd roms/seabios pushd roms/seabios