qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Nicholas Piggin" <npiggin@gmail.com>,
	qemu-ppc@nongnu.org, kvm@vger.kernel.org,
	"Chinmay Rath" <rathc@linux.ibm.com>,
	"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 11/18] hw/ppc/spapr: Remove deprecated pseries-4.0 machine
Date: Mon, 20 Oct 2025 12:38:07 +0200	[thread overview]
Message-ID: <20251020103815.78415-12-philmd@linaro.org> (raw)
In-Reply-To: <20251020103815.78415-1-philmd@linaro.org>

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/ppc/spapr.c | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index feb1e78b7c0..e861a2e7466 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4968,33 +4968,6 @@ static void spapr_machine_4_1_class_options(MachineClass *mc)
 
 DEFINE_SPAPR_MACHINE(4, 1);
 
-/*
- * pseries-4.0
- */
-static bool phb_placement_4_0(SpaprMachineState *spapr, uint32_t index,
-                              uint64_t *buid, hwaddr *pio,
-                              hwaddr *mmio32, hwaddr *mmio64,
-                              unsigned n_dma, uint32_t *liobns, Error **errp)
-{
-    if (!spapr_phb_placement(spapr, index, buid, pio, mmio32, mmio64, n_dma,
-                             liobns, errp)) {
-        return false;
-    }
-    return true;
-}
-static void spapr_machine_4_0_class_options(MachineClass *mc)
-{
-    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
-
-    spapr_machine_4_1_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
-    smc->phb_placement = phb_placement_4_0;
-    smc->irq = &spapr_irq_xics;
-    smc->pre_4_1_migration = true;
-}
-
-DEFINE_SPAPR_MACHINE(4, 0);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
-- 
2.51.0



  parent reply	other threads:[~2025-10-20 10:40 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-20 10:37 [PATCH 00/18] hw/ppc/spapr: Remove deprecated pseries-3.0 -> pseries-4.2 machines Philippe Mathieu-Daudé
2025-10-20 10:37 ` [PATCH 01/18] hw/ppc/spapr: Remove deprecated pseries-3.0 machine Philippe Mathieu-Daudé
2025-10-20 10:37 ` [PATCH 02/18] hw/ppc/spapr: Remove SpaprMachineClass::spapr_irq_xics_legacy field Philippe Mathieu-Daudé
2025-10-20 10:37 ` [PATCH 03/18] hw/ppc/spapr: Remove SpaprMachineClass::legacy_irq_allocation field Philippe Mathieu-Daudé
2025-10-20 10:38 ` [PATCH 04/18] hw/ppc/spapr: Remove SpaprMachineClass::nr_xirqs field Philippe Mathieu-Daudé
2025-10-20 10:38 ` [PATCH 05/18] hw/ppc/spapr: Remove deprecated pseries-3.1 machine Philippe Mathieu-Daudé
2025-10-20 10:38 ` [PATCH 06/18] hw/ppc/spapr: Remove SpaprMachineClass::broken_host_serial_model field Philippe Mathieu-Daudé
2025-10-20 10:38 ` [PATCH 07/18] target/ppc/kvm: Remove kvmppc_get_host_serial() as unused Philippe Mathieu-Daudé
2025-10-20 10:38 ` [PATCH 08/18] target/ppc/kvm: Remove kvmppc_get_host_model() " Philippe Mathieu-Daudé
2025-10-20 10:38 ` [PATCH 09/18] hw/ppc/spapr: Remove SpaprMachineClass::dr_phb_enabled field Philippe Mathieu-Daudé
2025-10-20 10:38 ` [PATCH 10/18] hw/ppc/spapr: Remove SpaprMachineClass::update_dt_enabled field Philippe Mathieu-Daudé
2025-10-20 10:38 ` Philippe Mathieu-Daudé [this message]
2025-10-20 10:38 ` [PATCH 12/18] hw/ppc/spapr: Remove SpaprMachineClass::pre_4_1_migration field Philippe Mathieu-Daudé
2025-10-20 10:38 ` [PATCH 13/18] hw/ppc/spapr: Remove SpaprMachineClass::phb_placement callback Philippe Mathieu-Daudé
2025-10-20 11:35 ` [PATCH 14/18] hw/ppc/spapr: Remove deprecated pseries-4.1 machine Philippe Mathieu-Daudé
2025-10-20 11:35 ` [PATCH 15/18] hw/ppc/spapr: Remove SpaprMachineClass::smp_threads_vsmt field Philippe Mathieu-Daudé
2025-10-20 11:35 ` [PATCH 16/18] hw/ppc/spapr: Remove SpaprMachineClass::linux_pci_probe field Philippe Mathieu-Daudé
2025-10-20 11:35 ` [PATCH 17/18] hw/ppc/spapr: Remove deprecated pseries-4.2 machine Philippe Mathieu-Daudé
2025-10-20 11:35 ` [PATCH 18/18] hw/ppc/spapr: Remove SpaprMachineClass::rma_limit field Philippe Mathieu-Daudé
2025-10-21  4:54 ` [PATCH 00/18] hw/ppc/spapr: Remove deprecated pseries-3.0 -> pseries-4.2 machines Harsh Prateek Bora
2025-10-21  6:31   ` Cédric Le Goater
2025-10-21  7:46     ` Philippe Mathieu-Daudé
2025-10-21  8:34       ` Harsh Prateek Bora
2025-10-21  8:41         ` Philippe Mathieu-Daudé

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=20251020103815.78415-12-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=harshpb@linux.ibm.com \
    --cc=kvm@vger.kernel.org \
    --cc=npiggin@gmail.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=rathc@linux.ibm.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 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).