diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-27 15:59:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-27 15:59:35 +0100 |
| commit | d666cacaeab904fb6e8361ee791b6e8ab8448577 (patch) | |
| tree | d2e4e678498bf5993d91424630be5997c799ef22 | |
| parent | 08df7e5577e4b926822032e218ef6ef478ab7aca (diff) | |
| parent | 9dacc908462693719d84ec594e839434959cf6f1 (diff) | |
| download | qemu-d666cacaeab904fb6e8361ee791b6e8ab8448577.zip qemu-d666cacaeab904fb6e8361ee791b6e8ab8448577.tar.gz qemu-d666cacaeab904fb6e8361ee791b6e8ab8448577.tar.bz2 | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170927' into staging
Another s390x compat fix that should make it into 2.10.1.
# gpg: Signature made Wed 27 Sep 2017 10:30:16 BST
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20170927:
s390x/cpumodel: remove ais from z14 default model-> also for 2.10.1
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/s390x/gen-features.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index c8dc104..68e6c31 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, |