From f2ac185797ae7e260a99dae91a6a9adf89538d49 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Thu, 13 Jun 2019 08:07:26 +0200 Subject: [PATCH] s390x/cpumodel: ignore csske for expansion RH-Author: David Hildenbrand Message-id: <20190613080726.13089-1-david@redhat.com> Patchwork-id: 88658 O-Subject: [RHEL-7.6.z qemu-kvm-ma PATCH] s390x/cpumodel: ignore csske for expansion Bugzilla: 1720262 RH-Acked-by: Jens Freimann RH-Acked-by: Cornelia Huck RH-Acked-by: Laurent Vivier RH-Acked-by: Eduardo Habkost 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 Cc: qemu-stable@nongnu.org Reviewed-by: David Hildenbrand Message-Id: <20190429090250.7648-3-borntraeger@de.ibm.com> Signed-off-by: Cornelia Huck (cherry picked from commit eaf6f642abf1d4d24791b70728d4068428fc4658) Signed-off-by: David Hildenbrand Signed-off-by: Miroslav Rezanina --- target/s390x/cpu_models.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 0b5d271..ed06498 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -1259,6 +1259,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; -- 1.8.3.1