From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, Halil Pasic <pasic@linux.ibm.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Eric Farman <farman@linux.ibm.com>
Subject: [PATCH 1/4] hw/s390x/s390-virtio-ccw: Remove the deprecated 3.0 machine type
Date: Mon, 14 Apr 2025 15:29:11 +0200 [thread overview]
Message-ID: <20250414132914.250423-2-thuth@redhat.com> (raw)
In-Reply-To: <20250414132914.250423-1-thuth@redhat.com>
From: Thomas Huth <thuth@redhat.com>
The s390-ccw-virtio-3.0 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 | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 42255921a80..370b03a0b97 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1206,21 +1206,6 @@ static void ccw_machine_3_1_class_options(MachineClass *mc)
}
DEFINE_CCW_MACHINE(3, 1);
-static void ccw_machine_3_0_instance_options(MachineState *machine)
-{
- ccw_machine_3_1_instance_options(machine);
-}
-
-static void ccw_machine_3_0_class_options(MachineClass *mc)
-{
- S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc);
-
- s390mc->hpage_1m_allowed = false;
- ccw_machine_3_1_class_options(mc);
- compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len);
-}
-DEFINE_CCW_MACHINE(3, 0);
-
static void ccw_machine_register_types(void)
{
type_register_static(&ccw_machine_info);
--
2.49.0
next prev parent reply other threads:[~2025-04-14 13:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-14 13:29 [PATCH for-10.1 0/4] s390x: Remove deprecated machine types v3.0 up to v4.0 Thomas Huth
2025-04-14 13:29 ` Thomas Huth [this message]
2025-04-14 13:29 ` [PATCH 2/4] hw/s390x: Remove the obsolete hpage_1m_allowed switch Thomas Huth
2025-04-14 16:20 ` Philippe Mathieu-Daudé
2025-04-14 13:29 ` [PATCH 3/4] hw/s390x/s390-virtio-ccw: Remove the deprecated 3.1 machine type Thomas Huth
2025-04-14 13:29 ` [PATCH 4/4] hw/s390x/s390-virtio-ccw: Remove the deprecated 4.0 " Thomas Huth
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=20250414132914.250423-2-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=farman@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).