From c1b364ffd7796ca11336d245f08054099fca7e0d Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Thu, 20 Jul 2017 13:27:31 +0200 Subject: [PATCH] s390/cpumodel: remove KSS from the default model of z14 The SIE_KSS feature will allow a guest to use KSS for a nested guest. To create a nested guest the SIE_F2 facility is still necessary. Since SIE_F2 is not part of the default model it does not make a lot of sense to provide the SIE_KSS feature in the default model. Let's also create a dependency check. Signed-off-by: Christian Borntraeger Reviewed-by: Jason J. Herne Reviewed-by: Janosch Frank Message-Id: <1500550051-7821-2-git-send-email-borntraeger@de.ibm.com> Acked-by: David Hildenbrand Signed-off-by: Cornelia Huck --- target/s390x/cpu_models.c | 1 + target/s390x/gen-features.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index f4e5bb6611..d91b7b85f6 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -723,6 +723,7 @@ static void check_consistency(const S390CPUModel *model) { S390_FEAT_KLMD_SHAKE_256, S390_FEAT_MSA }, { S390_FEAT_PRNO_TRNG_QRTCR, S390_FEAT_MSA_EXT_5 }, { S390_FEAT_PRNO_TRNG, S390_FEAT_MSA_EXT_5 }, + { S390_FEAT_SIE_KSS, S390_FEAT_SIE_F2 }, }; int i; diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index cf69157610..c8dc104bc1 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -535,7 +535,6 @@ static uint16_t default_GEN14_GA1[] = { S390_FEAT_GROUP_MSA_EXT_6, S390_FEAT_GROUP_MSA_EXT_7, S390_FEAT_GROUP_MSA_EXT_8, - S390_FEAT_SIE_KSS, }; /****** END FEATURE DEFS ******/