On 6/5/25 08:21, Thomas Huth wrote:
From: Thomas Huth <th...@redhat.com>

The s390-ccw-virtio-3.1 machine is older than 6 years, so according to
our machine support policy, it can be removed now. The v3.1 CPU feature
group gets merged into the minimum CPU feature group now.

Signed-off-by: Thomas Huth <th...@redhat.com>
---
  hw/s390x/s390-virtio-ccw.c  | 16 ----------------
  target/s390x/gen-features.c |  4 ----
  2 files changed, 20 deletions(-)


diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 754fc843d24..4346b92431b 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -849,9 +849,6 @@ static uint16_t qemu_MIN[] = {
      S390_FEAT_GROUP_PLO,
      S390_FEAT_ESAN3,
      S390_FEAT_ZARCH,
-};
-
-static uint16_t qemu_V3_1[] = {

Nice :)

Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>

      S390_FEAT_DAT_ENH,
      S390_FEAT_IDTE_SEGMENT,
      S390_FEAT_STFLE,
@@ -1055,7 +1052,6 @@ static FeatGroupDefSpec FeatGroupDef[] = {
   *******************************/
  static FeatGroupDefSpec QemuFeatDef[] = {
      QEMU_FEAT_INITIALIZER(MIN),
-    QEMU_FEAT_INITIALIZER(V3_1),
      QEMU_FEAT_INITIALIZER(V4_0),
      QEMU_FEAT_INITIALIZER(V4_1),
      QEMU_FEAT_INITIALIZER(V6_0),


Reply via email to