These machine types have been marked as deprecated two releases ago,
and are older than 6 years, so according to our support policy, it
should be fine to remove them now. 

Thomas Huth (8):
  hw/s390x/s390-virtio-ccw: Remove the deprecated 2.9 machine type
  hw/s390x/css: Remove the obsolete "css_migration_enabled" variable
  hw/s390x/s390-stattrib: Remove the old migration_enabled flag
  hw/intc/s390_flic: Remove the obsolete migration_enabled flag
  hw/s390x/s390-virtio-ccw: Remove the deprecated 2.10 and 2.11 machine
    types
  hw/s390x/event-facility: Remove the obsolete "allow_all_mask_sizes"
    code
  target/s390x/gen-features: Remove the v2.11 qemu CPU model
  hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type

 include/hw/s390x/css.h                |  6 ---
 include/hw/s390x/s390_flic.h          |  1 -
 include/hw/s390x/storage-attributes.h |  1 -
 hw/intc/s390_flic.c                   | 14 -----
 hw/s390x/css.c                        | 31 +----------
 hw/s390x/event-facility.c             | 37 +------------
 hw/s390x/s390-stattrib-kvm.c          |  2 +-
 hw/s390x/s390-stattrib.c              |  7 +--
 hw/s390x/s390-virtio-ccw.c            | 75 ---------------------------
 target/s390x/gen-features.c           |  7 ---
 10 files changed, 4 insertions(+), 177 deletions(-)

-- 
2.47.1

On 15/1/25 08:38, Thomas Huth wrote:
> These machine types have been marked as deprecated two releases ago,
> and are older than 6 years, so according to our support policy, it
> should be fine to remove them now.
> 
> Thomas Huth (8):
>    hw/s390x/s390-virtio-ccw: Remove the deprecated 2.9 machine type
>    hw/s390x/s390-virtio-ccw: Remove the deprecated 2.10 and 2.11 machine
>      types
>    target/s390x/gen-features: Remove the v2.11 qemu CPU model
>    hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type

Should this be documented in docs/about/removed-features.rst?

On 15/01/2025 17.35, Philippe Mathieu-Daudé wrote:
> On 15/1/25 08:38, Thomas Huth wrote:
>> These machine types have been marked as deprecated two releases ago,
>> and are older than 6 years, so according to our support policy, it
>> should be fine to remove them now.
>>
>> Thomas Huth (8):
>>    hw/s390x/s390-virtio-ccw: Remove the deprecated 2.9 machine type
>>    hw/s390x/s390-virtio-ccw: Remove the deprecated 2.10 and 2.11 machine
>>      types
>>    target/s390x/gen-features: Remove the v2.11 qemu CPU model
>>    hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type
> 
> Should this be documented in docs/about/removed-features.rst?

We've got a generic paragraph about machine removal now:

  https://gitlab.com/qemu-project/qemu/-/commit/ce80c4fa6ff

So I think we don't should manually mention each and every removed versioned 
machine type in removed-features.rst anymore. But some generic sentence in 
removed-features.rst about this would be good, too. I'll prepare a patch for it.

  Thomas