summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2017-09-27 09:20:28 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2017-09-28 16:55:08 -0500
commit17cd46fbdfb8cc0d759f05e19398b664d60781b8 (patch)
tree6f8b6b9d8419f611b5daf6d83fe8738754e3141f
parent6a903482b144e26f298b307c525fcd12a2486d7b (diff)
downloadqemu-17cd46fbdfb8cc0d759f05e19398b664d60781b8.tar.gz
s390x/cpumodel: remove ais from z14 default model-> also for 2.10.1
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> (cherry picked from commit 9dacc908462693719d84ec594e839434959cf6f1) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--target/s390x/gen-features.c1
1 files changed, 0 insertions, 1 deletions
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,