From 442feac1a3812e235baee5868d1b6096978fc62c Mon Sep 17 00:00:00 2001

From: David Hildenbrand <david@redhat.com>

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

Subject: [PATCH 01/12] s390x/cpumodel: enum type S390FeatGroup now gets

 generated

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

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

Patchwork-id: 88153

O-Subject: [RHEL8.1 qemu-kvm PATCH v2 01/10] s390x/cpumodel: enum type S390FeatGroup now gets generated

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>

The enumeration type S390FeatGroup is now generated as well.

This shall simplify the definition of new feature groups

without the requirement to modify existing code.

Signed-off-by: Michael Mueller <mimu@linux.ibm.com>

Message-Id: <20180725143617.8731-1-mimu@linux.ibm.com>

Acked-by: David Hildenbrand <david@redhat.com>

Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit a5f9ecc49d63a905da6598900e0a0eeec1ef269d)

Signed-off-by: David Hildenbrand <david@redhat.com>

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

---

 target/s390x/cpu_features.c |  1 -

 target/s390x/cpu_features.h | 19 +------------------

 target/s390x/gen-features.c | 18 +++++++++++++++++-

 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c

index 91e40c2..1843c84 100644

--- a/target/s390x/cpu_features.c

+++ b/target/s390x/cpu_features.c

@@ -13,7 +13,6 @@

 #include "qemu/osdep.h"

 #include "qemu/module.h"

 #include "cpu_features.h"

-#include "gen-features.h"

 #define FEAT_INIT(_name, _type, _bit, _desc) \

     {                                                \

diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h

index 968b12f..effe790 100644

--- a/target/s390x/cpu_features.h

+++ b/target/s390x/cpu_features.h

@@ -16,6 +16,7 @@

 #include "qemu/bitmap.h"

 #include "cpu_features_def.h"

+#include "gen-features.h"

 /* CPU features are announced via different ways */

 typedef enum {

@@ -64,24 +65,6 @@ void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type,

 void s390_feat_bitmap_to_ascii(const S390FeatBitmap features, void *opaque,

                                void (*fn)(const char *name, void *opaque));

-/* static groups that will never change */

-typedef enum {

-    S390_FEAT_GROUP_PLO,

-    S390_FEAT_GROUP_TOD_CLOCK_STEERING,

-    S390_FEAT_GROUP_GEN13_PTFF_ENH,

-    S390_FEAT_GROUP_MSA,

-    S390_FEAT_GROUP_MSA_EXT_1,

-    S390_FEAT_GROUP_MSA_EXT_2,

-    S390_FEAT_GROUP_MSA_EXT_3,

-    S390_FEAT_GROUP_MSA_EXT_4,

-    S390_FEAT_GROUP_MSA_EXT_5,

-    S390_FEAT_GROUP_MSA_EXT_6,

-    S390_FEAT_GROUP_MSA_EXT_7,

-    S390_FEAT_GROUP_MSA_EXT_8,

-    S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF,

-    S390_FEAT_GROUP_MAX,

-} S390FeatGroup;

-

 /* Definition of a CPU feature group */

 typedef struct {

     const char *name;       /* name exposed to the user */

diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c

index 739d5f1..dcc5d25 100644

--- a/target/s390x/gen-features.c

+++ b/target/s390x/gen-features.c

@@ -680,6 +680,7 @@ static CpuFeatDefSpec CpuFeatDef[] = {

 #define FEAT_GROUP_INITIALIZER(_name)                  \

     {                                                  \

         .name = "S390_FEAT_GROUP_LIST_" #_name,        \

+        .enum_name = "S390_FEAT_GROUP_" #_name,        \

         .bits =                                        \

             { .data = group_##_name,                   \

               .len = ARRAY_SIZE(group_##_name) },      \

@@ -687,6 +688,7 @@ static CpuFeatDefSpec CpuFeatDef[] = {

 typedef struct {

     const char *name;

+    const char *enum_name;

     BitSpec bits;

 } FeatGroupDefSpec;

@@ -697,7 +699,6 @@ static FeatGroupDefSpec FeatGroupDef[] = {

     FEAT_GROUP_INITIALIZER(PLO),

     FEAT_GROUP_INITIALIZER(TOD_CLOCK_STEERING),

     FEAT_GROUP_INITIALIZER(GEN13_PTFF),

-    FEAT_GROUP_INITIALIZER(MULTIPLE_EPOCH_PTFF),

     FEAT_GROUP_INITIALIZER(MSA),

     FEAT_GROUP_INITIALIZER(MSA_EXT_1),

     FEAT_GROUP_INITIALIZER(MSA_EXT_2),

@@ -707,6 +708,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {

     FEAT_GROUP_INITIALIZER(MSA_EXT_6),

     FEAT_GROUP_INITIALIZER(MSA_EXT_7),

     FEAT_GROUP_INITIALIZER(MSA_EXT_8),

+    FEAT_GROUP_INITIALIZER(MULTIPLE_EPOCH_PTFF),

 };

 #define QEMU_FEAT_INITIALIZER(_name)                   \

@@ -829,6 +831,19 @@ static void print_feature_group_defs(void)

     }

 }

+static void print_feature_group_enum_type(void)

+{

+    int i;

+

+    printf("\n/* CPU feature group enum type */\n"

+           "typedef enum {\n");

+    for (i = 0; i < ARRAY_SIZE(FeatGroupDef); i++) {

+        printf("\t%s,\n", FeatGroupDef[i].enum_name);

+    }

+    printf("\tS390_FEAT_GROUP_MAX,\n"

+           "} S390FeatGroup;\n");

+}

+

 int main(int argc, char *argv[])

 {

     printf("/*\n"

@@ -845,6 +860,7 @@ int main(int argc, char *argv[])

     print_feature_defs();

     print_feature_group_defs();

     print_qemu_feature_defs();

+    print_feature_group_enum_type();

     printf("\n#endif\n");

     return 0;

 }

-- 

1.8.3.1