From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Stefan Hajnoczi" <stefanha@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Eric Farman" <farman@linux.ibm.com>
Subject: [PULL 06/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 3.0 machine type
Date: Wed, 14 May 2025 13:27:26 +0200 [thread overview]
Message-ID: <20250514112733.456644-7-thuth@redhat.com> (raw)
In-Reply-To: <20250514112733.456644-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.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250506062148.306084-7-thuth@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
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 db3d26b2e4e..bec4690e857 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1223,21 +1223,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-05-14 11:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-14 11:27 [PULL 00/13] s390x obsolete machine removal & misc fixes Thomas Huth
2025-05-14 11:27 ` [PULL 01/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.10 machine type Thomas Huth
2025-05-14 11:27 ` [PULL 02/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.11 " Thomas Huth
2025-05-14 11:27 ` [PULL 03/13] hw/s390x/event-facility: Remove the obsolete "allow_all_mask_sizes" code Thomas Huth
2025-05-14 11:27 ` [PULL 04/13] target/s390x: Rename the qemu_V2_11 feature set to qemu_MIN Thomas Huth
2025-05-14 11:27 ` [PULL 05/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type Thomas Huth
2025-05-14 11:27 ` Thomas Huth [this message]
2025-05-14 11:27 ` [PULL 07/13] hw/s390x: Remove the obsolete hpage_1m_allowed switch Thomas Huth
2025-05-14 11:27 ` [PULL 08/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 3.1 machine type Thomas Huth
2025-05-14 11:27 ` [PULL 09/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 4.0 " Thomas Huth
2025-05-14 11:27 ` [PULL 10/13] s390x: Fix leak in machine_set_loadparm Thomas Huth
2025-05-14 11:27 ` [PULL 11/13] include/hw/dma/xlnx_dpdma: Remove dependency on console.h Thomas Huth
2025-05-14 11:27 ` [PULL 12/13] tests/functional/test_s390x_tuxrun: Check whether the machine is available Thomas Huth
2025-05-14 11:27 ` [PULL 13/13] tests/functional: Skip the screendump tests if the command is not available Thomas Huth
2025-05-15 21:52 ` [PULL 00/13] s390x obsolete machine removal & misc fixes Stefan Hajnoczi
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=20250514112733.456644-7-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=farman@linux.ibm.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.