diff options
| author | Thomas Huth <thuth@redhat.com> | 2025-01-15 08:38:12 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2025-04-23 07:51:25 +0200 |
| commit | 2de267c330381d44862a29efd9025d64c9c0e9b4 (patch) | |
| tree | 29a0032bba21c0fb7a00449b825af87535e74569 | |
| parent | 1da8f3a3c53b604edfe0d55e475102640490549e (diff) | |
| download | qemu-2de267c330381d44862a29efd9025d64c9c0e9b4.zip qemu-2de267c330381d44862a29efd9025d64c9c0e9b4.tar.gz qemu-2de267c330381d44862a29efd9025d64c9c0e9b4.tar.bz2 | |
hw/s390x/s390-virtio-ccw: Remove the deprecated 2.9 machine type
The s390-ccw-virtio-2.9 machine is older than 6 years, so according to
our machine support policy, it can be removed now.
Message-ID: <20250115073819.15452-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 75b3218..72de2bd 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1270,30 +1270,6 @@ static void ccw_machine_2_10_class_options(MachineClass *mc) } DEFINE_CCW_MACHINE(2, 10); -static void ccw_machine_2_9_instance_options(MachineState *machine) -{ - ccw_machine_2_10_instance_options(machine); - s390_cpudef_featoff_greater(12, 1, S390_FEAT_ESOP); - s390_cpudef_featoff_greater(12, 1, S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2); - s390_cpudef_featoff_greater(12, 1, S390_FEAT_ZPCI); - s390_cpudef_featoff_greater(12, 1, S390_FEAT_ADAPTER_INT_SUPPRESSION); - s390_cpudef_featoff_greater(12, 1, S390_FEAT_ADAPTER_EVENT_NOTIFICATION); - css_migration_enabled = false; -} - -static void ccw_machine_2_9_class_options(MachineClass *mc) -{ - static GlobalProperty compat[] = { - { TYPE_S390_STATTRIB, "migration-enabled", "off", }, - { TYPE_S390_FLIC_COMMON, "migration-enabled", "off", }, - }; - - ccw_machine_2_10_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); -} -DEFINE_CCW_MACHINE(2, 9); - #endif static void ccw_machine_register_types(void) |