From 382e149180b749ea95f62571b04ce87154d6fe54 Mon Sep 17 00:00:00 2001

From: David Hildenbrand <david@redhat.com>

Date: Wed, 22 May 2019 08:03:55 +0100

Subject: [PATCH 03/12] s390x/cpumodel: ignore csske for expansion

RH-Author: David Hildenbrand <david@redhat.com>

Message-id: <20190522080402.20173-4-david@redhat.com>

Patchwork-id: 88158

O-Subject: [RHEL8.1 qemu-kvm PATCH v2 03/10] s390x/cpumodel: ignore csske for expansion

Bugzilla: 1660912

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

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: David Hildenbrand <david@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 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 d2c16b8..b4d9047 100644

--- a/target/s390x/cpu_models.c

+++ b/target/s390x/cpu_models.c

@@ -1274,6 +1274,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