diff options
| author | Thomas Huth <thuth@redhat.com> | 2025-05-06 08:21:47 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2025-05-14 06:58:31 +0200 |
| commit | 3b912daea079445aad40d8e189c40597b229cf10 (patch) | |
| tree | b404bbde78c0e7fd03d245d8a7e3223a9c885061 | |
| parent | bbe6f504ef181f3745762818249bbf7ca44bf363 (diff) | |
| download | qemu-3b912daea079445aad40d8e189c40597b229cf10.zip qemu-3b912daea079445aad40d8e189c40597b229cf10.tar.gz qemu-3b912daea079445aad40d8e189c40597b229cf10.tar.bz2 | |
hw/s390x/s390-virtio-ccw: Remove the deprecated 3.1 machine type
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.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250506062148.306084-9-thuth@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 16 | ||||
| -rw-r--r-- | target/s390x/gen-features.c | 4 |
2 files changed, 0 insertions, 20 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index b013bcd..95c12a4 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1172,22 +1172,6 @@ static void ccw_machine_4_0_class_options(MachineClass *mc) } DEFINE_CCW_MACHINE(4, 0); -static void ccw_machine_3_1_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V3_1 }; - ccw_machine_4_0_instance_options(machine); - s390_cpudef_featoff_greater(14, 1, S390_FEAT_MULTIPLE_EPOCH); - s390_cpudef_group_featoff_greater(14, 1, S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF); - s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat); -} - -static void ccw_machine_3_1_class_options(MachineClass *mc) -{ - ccw_machine_4_0_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_3_1, hw_compat_3_1_len); -} -DEFINE_CCW_MACHINE(3, 1); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 754fc84..4346b92 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[] = { 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), |