qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-s390x@nongnu.org, Halil Pasic <pasic@linux.ibm.com>,
	Christian Borntraeger <borntraeger@linux.ibm.com>,
	Eric Farman <farman@linux.ibm.com>
Cc: qemu-devel@nongnu.org, David Hildenbrand <david@redhat.com>,
	Ilya Leoshkevich <iii@linux.ibm.com>
Subject: [PATCH v2 2/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.11 machine type
Date: Tue,  6 May 2025 08:21:41 +0200	[thread overview]
Message-ID: <20250506062148.306084-3-thuth@redhat.com> (raw)
In-Reply-To: <20250506062148.306084-1-thuth@redhat.com>

From: Thomas Huth <thuth@redhat.com>

The s390-ccw-virtio-2.11 machine is older than 6 years, so according
to our machine support policy, it can be removed now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/s390x/s390-virtio-ccw.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 0813eb4ea47..2c90702d834 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1250,31 +1250,6 @@ static void ccw_machine_2_12_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(2, 12);
 
-#ifdef CONFIG_S390X_LEGACY_CPUS
-
-static void ccw_machine_2_11_instance_options(MachineState *machine)
-{
-    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V2_11 };
-    ccw_machine_2_12_instance_options(machine);
-
-    /* before 2.12 we emulated the very first z900 */
-    s390_set_qemu_cpu_model(0x2064, 7, 1, qemu_cpu_feat);
-}
-
-static void ccw_machine_2_11_class_options(MachineClass *mc)
-{
-    static GlobalProperty compat[] = {
-        { TYPE_SCLP_EVENT_FACILITY, "allow_all_mask_sizes", "off", },
-    };
-
-    ccw_machine_2_12_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len);
-    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-}
-DEFINE_CCW_MACHINE(2, 11);
-
-#endif
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.49.0



  parent reply	other threads:[~2025-05-06  6:23 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-06  6:21 [PATCH v2 0/9] s390x: Remove deprecated machine types up to v4.0 Thomas Huth
2025-05-06  6:21 ` [PATCH v2 1/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.10 machine type Thomas Huth
2025-05-06  8:11   ` Philippe Mathieu-Daudé
2025-05-06  6:21 ` Thomas Huth [this message]
2025-05-06  8:11   ` [PATCH v2 2/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.11 " Philippe Mathieu-Daudé
2025-05-06  6:21 ` [PATCH v2 3/9] hw/s390x/event-facility: Remove the obsolete "allow_all_mask_sizes" code Thomas Huth
2025-05-06  8:15   ` Philippe Mathieu-Daudé
2025-05-06  6:21 ` [PATCH v2 4/9] target/s390x: Rename the qemu_V2_11 feature set to qemu_MIN Thomas Huth
2025-05-06  8:12   ` Philippe Mathieu-Daudé
2025-05-06  6:21 ` [PATCH v2 5/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type Thomas Huth
2025-05-06  8:13   ` Philippe Mathieu-Daudé
2025-05-06  6:21 ` [PATCH v2 6/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 3.0 " Thomas Huth
2025-05-06  8:13   ` Philippe Mathieu-Daudé
2025-05-06  6:21 ` [PATCH v2 7/9] hw/s390x: Remove the obsolete hpage_1m_allowed switch Thomas Huth
2025-05-06  6:21 ` [PATCH v2 8/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 3.1 machine type Thomas Huth
2025-05-06  8:14   ` Philippe Mathieu-Daudé
2025-05-06  6:21 ` [PATCH v2 9/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 4.0 " Thomas Huth
2025-05-06  8:14   ` Philippe Mathieu-Daudé
2025-05-14  1:50 ` [PATCH v2 0/9] s390x: Remove deprecated machine types up to v4.0 Eric Farman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250506062148.306084-3-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=borntraeger@linux.ibm.com \
    --cc=david@redhat.com \
    --cc=farman@linux.ibm.com \
    --cc=iii@linux.ibm.com \
    --cc=pasic@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).