From 0891c2bcaf882146968dc012b936968dbca55a196a05cdfa4896034b4238f584 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 15 Apr 2015 00:37:26 +0000 Subject: [PATCH] - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3 * Patches added: 0039-s390x-Fix-stoc-direction.patch - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3 - Fix s390x stoc instructions * Patches added: 0039-s390x-Fix-stoc-direction.patch - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3 - Fix s390x stoc instructions * Patches added: 0039-s390x-Fix-stoc-direction.patch - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3 - Fix s390x stoc instructions * Patches added: 0039-s390x-Fix-stoc-direction.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=251 --- 0039-s390x-Fix-stoc-direction.patch | 31 +++++++++++++++++++++++++++++ libcacard.changes | 7 +++++++ libcacard.spec | 4 +++- qemu-linux-user.changes | 8 ++++++++ qemu-linux-user.spec | 4 +++- qemu-testsuite.changes | 8 ++++++++ qemu-testsuite.spec | 4 +++- qemu.changes | 8 ++++++++ qemu.spec | 4 +++- 9 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 0039-s390x-Fix-stoc-direction.patch diff --git a/0039-s390x-Fix-stoc-direction.patch b/0039-s390x-Fix-stoc-direction.patch new file mode 100644 index 00000000..0d7924db --- /dev/null +++ b/0039-s390x-Fix-stoc-direction.patch @@ -0,0 +1,31 @@ +From fd4142fc207b6d6633f0162631f8ff303807f5f5 Mon Sep 17 00:00:00 2001 +From: Alexander Graf +Date: Wed, 15 Apr 2015 02:28:05 +0200 +Subject: [PATCH] s390x: Fix stoc direction + +The store conditional instruction wants to store when the condition +is fulfilled, so we should branch out when it's not true. + +The code today branches out when the condition is true, clearly +reversing the logic. Fix it up by negating the condition. + +Signed-off-by: Alexander Graf +--- + target-s390x/translate.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/target-s390x/translate.c b/target-s390x/translate.c +index 4f82edd..8ae4912 100644 +--- a/target-s390x/translate.c ++++ b/target-s390x/translate.c +@@ -3082,6 +3082,10 @@ static ExitStatus op_soc(DisasContext *s, DisasOps *o) + + disas_jcc(s, &c, get_field(s->fields, m3)); + ++ /* We want to store when the condition is fulfilled, so branch ++ out when it's not */ ++ c.cond = tcg_invert_cond(c.cond); ++ + lab = gen_new_label(); + if (c.is_64) { + tcg_gen_brcond_i64(c.cond, c.u.s64.a, c.u.s64.b, lab); diff --git a/libcacard.changes b/libcacard.changes index bb9f080a..26dde947 100644 --- a/libcacard.changes +++ b/libcacard.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 15 00:34:56 UTC 2015 - agraf@suse.com + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3 +* Patches added: + 0039-s390x-Fix-stoc-direction.patch + ------------------------------------------------------------------- Tue Apr 14 16:06:47 UTC 2015 - afaerber@suse.de diff --git a/libcacard.spec b/libcacard.spec index c143a306..d94f77ff 100644 --- a/libcacard.spec +++ b/libcacard.spec @@ -1,7 +1,7 @@ # # spec file for package libcacard # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -63,6 +63,7 @@ Patch0035: 0035-qtest-Increase-socket-timeout.patch Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch +Patch0039: 0039-s390x-Fix-stoc-direction.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: qemu-rpmlintrc @@ -160,6 +161,7 @@ This sub-package contains development files for the Smartcard library. %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 +%patch0039 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index 05595ccb..12c01591 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Apr 15 00:34:53 UTC 2015 - agraf@suse.com + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3 +- Fix s390x stoc instructions +* Patches added: + 0039-s390x-Fix-stoc-direction.patch + ------------------------------------------------------------------- Tue Apr 14 16:06:43 UTC 2015 - afaerber@suse.de diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index d08e2f3e..1be22e7b 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -1,7 +1,7 @@ # # spec file for package qemu-linux-user # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -63,6 +63,7 @@ Patch0035: 0035-qtest-Increase-socket-timeout.patch Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch +Patch0039: 0039-s390x-Fix-stoc-direction.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 81efc4c9..54b1929b 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Apr 15 00:34:50 UTC 2015 - agraf@suse.com + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3 +- Fix s390x stoc instructions +* Patches added: + 0039-s390x-Fix-stoc-direction.patch + ------------------------------------------------------------------- Tue Apr 14 16:06:39 UTC 2015 - afaerber@suse.de diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 3708d953..0f1bf4ae 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -1,7 +1,7 @@ # # spec file for package qemu-testsuite # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -94,6 +94,7 @@ Patch0035: 0035-qtest-Increase-socket-timeout.patch Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch +Patch0039: 0039-s390x-Fix-stoc-direction.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -592,6 +593,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 81efc4c9..54b1929b 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Apr 15 00:34:50 UTC 2015 - agraf@suse.com + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3 +- Fix s390x stoc instructions +* Patches added: + 0039-s390x-Fix-stoc-direction.patch + ------------------------------------------------------------------- Tue Apr 14 16:06:39 UTC 2015 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index eead6160..210b1577 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,7 +1,7 @@ # # spec file for package qemu # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -94,6 +94,7 @@ Patch0035: 0035-qtest-Increase-socket-timeout.patch Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch Patch0037: 0037-linux-user-Allocate-thunk-size-dyna.patch Patch0038: 0038-Revert-Revert-seccomp-tests-that-al.patch +Patch0039: 0039-s390x-Fix-stoc-direction.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -592,6 +593,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