[Qemu-devel] [PULL URGENT 0/1] another s390x compat fix

[Qemu-devel] [PULL URGENT 0/1] another s390x compat fix

[Cornelia Huck]

The following changes since commit 31bc1d8481af414cfa2857f905e40f7d8e6d5b2e:

  Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging (2017-09-26 19:49:08 +0100)

are available in the git repository at:

  git://github.com/cohuck/qemu tags/s390x-20170927

for you to fetch changes up to 9dacc908462693719d84ec594e839434959cf6f1:

  s390x/cpumodel: remove ais from z14 default model-> also for 2.10.1 (2017-09-27 11:13:32 +0200)

----------------------------------------------------------------
Another s390x compat fix that should make it into 2.10.1.

----------------------------------------------------------------

Christian Borntraeger (1):
  s390x/cpumodel: remove ais from z14 default model-> also for 2.10.1

 target/s390x/gen-features.c | 1 -
 1 file changed, 1 deletion(-)

-- 
2.13.5

[Qemu-devel] [PULL URGENT 1/1] s390x/cpumodel: remove ais from z14 default model-> also for 2.10.1

[Cornelia Huck]

From: Christian Borntraeger <borntraeger@de.ibm.com>

We disabled ais for 2.10, so let's also remove it from the z14
default model.

Fixes: 3f2d07b3b01e ("s390x/ais: for 2.10 stable: disable ais facility")
CC: qemu-stable@nongnu.org
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <20170927072030.35737-2-borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 target/s390x/gen-features.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index c8dc104bc1..68e6c31b4b 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -527,7 +527,6 @@ static uint16_t default_GEN13_GA1[] = {
 #define default_GEN13_GA2 EmptyFeat
 
 static uint16_t default_GEN14_GA1[] = {
-    S390_FEAT_ADAPTER_INT_SUPPRESSION,
     S390_FEAT_INSTRUCTION_EXEC_PROT,
     S390_FEAT_GUARDED_STORAGE,
     S390_FEAT_VECTOR_PACKED_DECIMAL,
-- 
2.13.5

Re: [Qemu-devel] [PULL URGENT 0/1] another s390x compat fix

[Peter Maydell]

On 27 September 2017 at 02:36, Cornelia Huck <cohuck@redhat.com> wrote:
> The following changes since commit 31bc1d8481af414cfa2857f905e40f7d8e6d5b2e:
>
>   Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging (2017-09-26 19:49:08 +0100)
>
> are available in the git repository at:
>
>   git://github.com/cohuck/qemu tags/s390x-20170927
>
> for you to fetch changes up to 9dacc908462693719d84ec594e839434959cf6f1:
>
>   s390x/cpumodel: remove ais from z14 default model-> also for 2.10.1 (2017-09-27 11:13:32 +0200)
>
> ----------------------------------------------------------------
> Another s390x compat fix that should make it into 2.10.1.
>
> ----------------------------------------------------------------
>
> Christian Borntraeger (1):
>   s390x/cpumodel: remove ais from z14 default model-> also for 2.10.1
>
>  target/s390x/gen-features.c | 1 -
>  1 file changed, 1 deletion(-)
>

Applied, thanks.

-- PMM