OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Another s390x compat fix that should make it into 2.10.1.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJZy2+oAAoJEN7Pa5PG8C+vYYUP/ArmFshEDzprmDSclrN5tnUT
 Q15q+cHX3oo+lNKXNuoyOafhYn2VLiVOUlK2B85wCFUuEs2j1NigEXgW/fbqPN1u
 JGylLFFQwXBNnCSjVjZGCFYe8NzGXQbXz6pxEqSg45s2JdYp6y6CJDWa3MLu0zhW
 N9wk4dYQtBRvPHgYvsh292ljkoMkk8+ben9CwD4YV+DZ9AStmF4LQClEEIJDjMGC
 bhqosYJqyNx843pY7ABQUEQfEkpmkuCB832RkMKmooZJSIJLTohvL08TRMGqdXiS
 QTkHWPh0n/66G2RjvXc1j9qm6H6uUQgFlXlwMARAOK2pfhYRfEOCu9eok+7qGhwF
 3E3EILTtw8D6s9kECoqbSdYZxakEJFLxt0mY9EKsCV0hDp7wFUZqQEyOlMyLgij4
 PTd/MF2dV+F8bPs6VKG3tARUO/3J2MtMeE8rNsQiEzLvO3PVICWeLFZGWf0sTefO
 K9r1Fq22PujGyTIBLjVfZiyR7Z2mYBrgoCIUnn8xKdlOUMQerec9PQUwzw74zGQi
 iFWd2b6DAe8+VSYHl1p132o77RWs47Ts+0VQgyRc2Md0wWJlugfTNC6SQNrmcOEL
 Zm1YaNo94m5nT7ClGcq7DBD33YGvbeUjiqdO6fc0EZ8AVwbGXL3S59Tm6iCpV+9h
 O04XxbiqKIIdRe6C1uoQ
 =xsKv
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-09-27 15:59:35 +01:00
commit d666cacaea
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/s390x/gen-features.c
View File

@ -527,7 +527,6 @@ static uint16_t default_GEN13_GA1[] = {
#define default_GEN13_GA2 EmptyFeat #define default_GEN13_GA2 EmptyFeat
static uint16_t default_GEN14_GA1[] = { static uint16_t default_GEN14_GA1[] = {
S390_FEAT_ADAPTER_INT_SUPPRESSION,
S390_FEAT_INSTRUCTION_EXEC_PROT, S390_FEAT_INSTRUCTION_EXEC_PROT,
S390_FEAT_GUARDED_STORAGE, S390_FEAT_GUARDED_STORAGE,
S390_FEAT_VECTOR_PACKED_DECIMAL, S390_FEAT_VECTOR_PACKED_DECIMAL,