s390x: Remove deprecated machine types v2.9 up to v2.12

[PATCH 7/8] target/s390x/gen-features: Remove the v2.11 qemu CPU model

Posted by Thomas Huth 3 months, 4 weeks ago

Now that the v2.11 machine is gone, we don't need the v2.11 CPU
feature set anymore.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 target/s390x/gen-features.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 41840677ce..150e4d1843 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -844,12 +844,6 @@ static uint16_t default_GEN17_GA1[] = {
 
 /* QEMU (CPU model) features */
 
-static uint16_t qemu_V2_11[] = {
-    S390_FEAT_GROUP_PLO,
-    S390_FEAT_ESAN3,
-    S390_FEAT_ZARCH,
-};
-
 static uint16_t qemu_V3_1[] = {
     S390_FEAT_DAT_ENH,
     S390_FEAT_IDTE_SEGMENT,
@@ -1053,7 +1047,6 @@ static FeatGroupDefSpec FeatGroupDef[] = {
  * QEMU (CPU model) features
  *******************************/
 static FeatGroupDefSpec QemuFeatDef[] = {
-    QEMU_FEAT_INITIALIZER(V2_11),
     QEMU_FEAT_INITIALIZER(V3_1),
     QEMU_FEAT_INITIALIZER(V4_0),
     QEMU_FEAT_INITIALIZER(V4_1),
-- 
2.47.1

Re: [PATCH 7/8] target/s390x/gen-features: Remove the v2.11 qemu CPU model

Posted by Thomas Huth 2 weeks, 6 days ago

On 15/01/2025 08.38, Thomas Huth wrote:
> Now that the v2.11 machine is gone, we don't need the v2.11 CPU
> feature set anymore.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   target/s390x/gen-features.c | 7 -------
>   1 file changed, 7 deletions(-)
> 
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index 41840677ce..150e4d1843 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -844,12 +844,6 @@ static uint16_t default_GEN17_GA1[] = {
>   
>   /* QEMU (CPU model) features */
>   
> -static uint16_t qemu_V2_11[] = {
> -    S390_FEAT_GROUP_PLO,
> -    S390_FEAT_ESAN3,
> -    S390_FEAT_ZARCH,
> -};
> -
>   static uint16_t qemu_V3_1[] = {
>       S390_FEAT_DAT_ENH,
>       S390_FEAT_IDTE_SEGMENT,
> @@ -1053,7 +1047,6 @@ static FeatGroupDefSpec FeatGroupDef[] = {
>    * QEMU (CPU model) features
>    *******************************/
>   static FeatGroupDefSpec QemuFeatDef[] = {
> -    QEMU_FEAT_INITIALIZER(V2_11),

Removing this from QemuFeatDef caused some trouble during testing, so this 
patch seems to be wrong. I'll try to fix it and send a v2 later...

  Thomas