From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Mon, 29 Apr 2019 09:02:43 +0000 (-0400)
Subject: s390x/cpumodel: ignore csske for expansion
X-Git-Tag: v4.0.1~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8d98e2b6db347922972126decbd2f9bb95d8326;p=thirdparty%2Fqemu.git

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>
---

diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index eb125d4d0d8..e154d53eda6 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -1327,6 +1327,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;