diff options
| author | Thomas Huth <thuth@redhat.com> | 2025-05-06 08:21:48 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2025-05-14 06:58:47 +0200 |
| commit | 1b432c51cd12e778079ee0cfd7e4c51aad928c65 (patch) | |
| tree | a8f74145e0eba7518202efd96136f29a35f464ae | |
| parent | 3b912daea079445aad40d8e189c40597b229cf10 (diff) | |
| download | qemu-1b432c51cd12e778079ee0cfd7e4c51aad928c65.zip qemu-1b432c51cd12e778079ee0cfd7e4c51aad928c65.tar.gz qemu-1b432c51cd12e778079ee0cfd7e4c51aad928c65.tar.bz2 | |
hw/s390x/s390-virtio-ccw: Remove the deprecated 4.0 machine type
The s390-ccw-virtio-4.0 machine is older than 6 years, so according to
our machine support policy, it can be removed now. The corresponding
v4.0 CPU feature group gets merged into the minimum feature group now.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250506062148.306084-10-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 | 14 | ||||
| -rw-r--r-- | target/s390x/gen-features.c | 4 |
2 files changed, 0 insertions, 18 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 95c12a4..431d6b7 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1158,20 +1158,6 @@ static void ccw_machine_4_1_class_options(MachineClass *mc) } DEFINE_CCW_MACHINE(4, 1); -static void ccw_machine_4_0_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V4_0 }; - ccw_machine_4_1_instance_options(machine); - s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat); -} - -static void ccw_machine_4_0_class_options(MachineClass *mc) -{ - ccw_machine_4_1_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); -} -DEFINE_CCW_MACHINE(4, 0); - 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 4346b92..a814ece 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -878,9 +878,6 @@ static uint16_t qemu_MIN[] = { S390_FEAT_ADAPTER_INT_SUPPRESSION, S390_FEAT_MSA_EXT_3, S390_FEAT_MSA_EXT_4, -}; - -static uint16_t qemu_V4_0[] = { /* * Only BFP bits are implemented (HFP, DFP, PFPO and DIVIDE TO INTEGER not * implemented yet). @@ -1052,7 +1049,6 @@ static FeatGroupDefSpec FeatGroupDef[] = { *******************************/ static FeatGroupDefSpec QemuFeatDef[] = { QEMU_FEAT_INITIALIZER(MIN), - QEMU_FEAT_INITIALIZER(V4_0), QEMU_FEAT_INITIALIZER(V4_1), QEMU_FEAT_INITIALIZER(V6_0), QEMU_FEAT_INITIALIZER(V6_2), |