diff options
author | Christian Borntraeger <borntraeger@de.ibm.com> | 2019-04-29 05:02:43 -0400 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2019-07-09 13:41:42 -0500 |
commit | 2157938f7b4fd87340b13b3e74d0284cf178075c (patch) | |
tree | 63f7885fda89203d2e3588c8c220865732c96dae /target/s390x | |
parent | f56e70ee4f47a4232c99764f0508cd37b97ca425 (diff) |
s390x/cpumodel: ignore csske for expansion
csske will be removed in a future machine. Ignore it for expanding the
cpu model. Otherwise qemu falls back to z9.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: qemu-stable@nongnu.org
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20190429090250.7648-3-borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
(cherry picked from commit eaf6f642abf1d4d24791b70728d4068428fc4658)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'target/s390x')
-rw-r--r-- | target/s390x/cpu_models.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 7c253ff308..d4464a2ea6 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -1297,6 +1297,8 @@ static void init_ignored_base_feat(void) S390_FEAT_KM_TDEA_192, S390_FEAT_KIMD_SHA_1, S390_FEAT_KLMD_SHA_1, + /* CSSKE is deprecated on newer generations */ + S390_FEAT_CONDITIONAL_SSKE, }; int i; |