b38b0f
From 382e149180b749ea95f62571b04ce87154d6fe54 Mon Sep 17 00:00:00 2001
b38b0f
From: David Hildenbrand <david@redhat.com>
b38b0f
Date: Wed, 22 May 2019 08:03:55 +0100
b38b0f
Subject: [PATCH 03/12] s390x/cpumodel: ignore csske for expansion
b38b0f
b38b0f
RH-Author: David Hildenbrand <david@redhat.com>
b38b0f
Message-id: <20190522080402.20173-4-david@redhat.com>
b38b0f
Patchwork-id: 88158
b38b0f
O-Subject: [RHEL8.1 qemu-kvm PATCH v2 03/10] s390x/cpumodel: ignore csske for expansion
b38b0f
Bugzilla: 1660912
b38b0f
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
b38b0f
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
b38b0f
RH-Acked-by: Thomas Huth <thuth@redhat.com>
b38b0f
b38b0f
csske will be removed in a future machine. Ignore it for expanding the
b38b0f
cpu model. Otherwise qemu falls back to z9.
b38b0f
b38b0f
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
b38b0f
Cc: qemu-stable@nongnu.org
b38b0f
Reviewed-by: David Hildenbrand <david@redhat.com>
b38b0f
Message-Id: <20190429090250.7648-3-borntraeger@de.ibm.com>
b38b0f
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
b38b0f
(cherry picked from commit eaf6f642abf1d4d24791b70728d4068428fc4658)
b38b0f
Signed-off-by: David Hildenbrand <david@redhat.com>
b38b0f
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
b38b0f
---
b38b0f
 target/s390x/cpu_models.c | 2 ++
b38b0f
 1 file changed, 2 insertions(+)
b38b0f
b38b0f
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
b38b0f
index d2c16b8..b4d9047 100644
b38b0f
--- a/target/s390x/cpu_models.c
b38b0f
+++ b/target/s390x/cpu_models.c
b38b0f
@@ -1274,6 +1274,8 @@ static void init_ignored_base_feat(void)
b38b0f
          S390_FEAT_KM_TDEA_192,
b38b0f
          S390_FEAT_KIMD_SHA_1,
b38b0f
          S390_FEAT_KLMD_SHA_1,
b38b0f
+         /* CSSKE is deprecated on newer generations */
b38b0f
+         S390_FEAT_CONDITIONAL_SSKE,
b38b0f
     };
b38b0f
     int i;
b38b0f
 
b38b0f
-- 
b38b0f
1.8.3.1
b38b0f