From 6bd2a32b23c4d1ea45f7aea34d95817e7f1f5e0b Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Tue, 16 Jul 2019 20:44:22 +0100 Subject: [PATCH 20/39] s390x/cpumodel: change internal name of vxpdeh to match description RH-Author: David Hildenbrand Message-id: <20190716204422.9350-5-david@redhat.com> Patchwork-id: 89548 O-Subject: [RHEL8.1 qemu-kvm PATCH 4/4] s390x/cpumodel: change internal name of vxpdeh to match description Bugzilla: 1729975 RH-Acked-by: Thomas Huth RH-Acked-by: Cornelia Huck RH-Acked-by: Jens Freimann Conflicts: upstream changed the way cpu features are defined The internal macro name VECTOR_BCD_ENH does not match the actual description. Fix this. Signed-off-by: Christian Borntraeger Message-Id: <20190715142304.215018-4-borntraeger@de.ibm.com> [CH: vxp->vxpdeh, as discussed] Reviewed-by: David Hildenbrand Reviewed-by: Thomas Huth Signed-off-by: Cornelia Huck (cherry picked from commit 5d8866c89817998a3d9c3055d5dc2b5a8e78658a) Signed-off-by: David Hildenbrand Signed-off-by: Danilo C. L. de Paula --- target/s390x/cpu_features_def.h | 2 +- target/s390x/gen-features.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h index 292b17b..a7abe4d 100644 --- a/target/s390x/cpu_features_def.h +++ b/target/s390x/cpu_features_def.h @@ -99,7 +99,7 @@ typedef enum { S390_FEAT_VECTOR_ENH2, S390_FEAT_ESORT_BASE, S390_FEAT_DEFLATE_BASE, - S390_FEAT_VECTOR_BCD_ENH, + S390_FEAT_VECTOR_PACKED_DECIMAL_ENH, S390_FEAT_MSA_EXT_9, S390_FEAT_ETOKEN, diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 384d60a..24d78e9 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -557,7 +557,7 @@ static uint16_t full_GEN15_GA1[] = { S390_FEAT_VECTOR_ENH2, S390_FEAT_GROUP_ENH_SORT, S390_FEAT_GROUP_DEFLATE_CONVERSION, - S390_FEAT_VECTOR_BCD_ENH, + S390_FEAT_VECTOR_PACKED_DECIMAL_ENH, S390_FEAT_GROUP_MSA_EXT_9, S390_FEAT_GROUP_MSA_EXT_9_PCKMO, S390_FEAT_ETOKEN, @@ -648,7 +648,7 @@ static uint16_t default_GEN14_GA2[] = { static uint16_t default_GEN15_GA1[] = { S390_FEAT_VECTOR_ENH2, S390_FEAT_GROUP_DEFLATE_CONVERSION, - S390_FEAT_VECTOR_BCD_ENH, + S390_FEAT_VECTOR_PACKED_DECIMAL_ENH, S390_FEAT_GROUP_MSA_EXT_9, S390_FEAT_GROUP_MSA_EXT_9_PCKMO, S390_FEAT_ETOKEN, -- 1.8.3.1