|
 |
b21ec6 |
From f2ac185797ae7e260a99dae91a6a9adf89538d49 Mon Sep 17 00:00:00 2001
|
|
|
b21ec6 |
From: David Hildenbrand <david@redhat.com>
|
|
|
b21ec6 |
Date: Thu, 13 Jun 2019 08:07:26 +0200
|
|
|
b21ec6 |
Subject: [PATCH] s390x/cpumodel: ignore csske for expansion
|
|
|
b21ec6 |
|
|
|
b21ec6 |
RH-Author: David Hildenbrand <david@redhat.com>
|
|
|
b21ec6 |
Message-id: <20190613080726.13089-1-david@redhat.com>
|
|
|
b21ec6 |
Patchwork-id: 88658
|
|
|
b21ec6 |
O-Subject: [RHEL-7.6.z qemu-kvm-ma PATCH] s390x/cpumodel: ignore csske for expansion
|
|
|
b21ec6 |
Bugzilla: 1720262
|
|
|
b21ec6 |
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
b21ec6 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
b21ec6 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
b21ec6 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
b21ec6 |
|
|
|
b21ec6 |
csske will be removed in a future machine. Ignore it for expanding the
|
|
|
b21ec6 |
cpu model. Otherwise qemu falls back to z9.
|
|
|
b21ec6 |
|
|
|
b21ec6 |
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
|
b21ec6 |
Cc: qemu-stable@nongnu.org
|
|
|
b21ec6 |
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
|
b21ec6 |
Message-Id: <20190429090250.7648-3-borntraeger@de.ibm.com>
|
|
|
b21ec6 |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
b21ec6 |
(cherry picked from commit eaf6f642abf1d4d24791b70728d4068428fc4658)
|
|
|
b21ec6 |
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
|
b21ec6 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
b21ec6 |
---
|
|
|
b21ec6 |
target/s390x/cpu_models.c | 2 ++
|
|
|
b21ec6 |
1 file changed, 2 insertions(+)
|
|
|
b21ec6 |
|
|
|
b21ec6 |
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
|
|
|
b21ec6 |
index 0b5d271..ed06498 100644
|
|
|
b21ec6 |
--- a/target/s390x/cpu_models.c
|
|
|
b21ec6 |
+++ b/target/s390x/cpu_models.c
|
|
|
b21ec6 |
@@ -1259,6 +1259,8 @@ static void init_ignored_base_feat(void)
|
|
|
b21ec6 |
S390_FEAT_KM_TDEA_192,
|
|
|
b21ec6 |
S390_FEAT_KIMD_SHA_1,
|
|
|
b21ec6 |
S390_FEAT_KLMD_SHA_1,
|
|
|
b21ec6 |
+ /* CSSKE is deprecated on newer generations */
|
|
|
b21ec6 |
+ S390_FEAT_CONDITIONAL_SSKE,
|
|
|
b21ec6 |
};
|
|
|
b21ec6 |
int i;
|
|
|
b21ec6 |
|
|
|
b21ec6 |
--
|
|
|
b21ec6 |
1.8.3.1
|
|
|
b21ec6 |
|