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 02/18] hw/ppc/spapr: Remove SpaprMachineClass::spapr_irq_xics_legacy field
Date: Mon, 20 Oct 2025 12:37:58 +0200	[thread overview]
Message-ID: <20251020103815.78415-3-philmd@linaro.org> (raw)
In-Reply-To: <20251020103815.78415-1-philmd@linaro.org>
The SpaprMachineClass::spapr_irq_xics_legacy field was only used by the
pseries-3.0 machine, which got removed. Remove it as now unused.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/ppc/spapr_irq.h | 1 -
 hw/ppc/spapr.c             | 4 +---
 hw/ppc/spapr_irq.c         | 5 -----
 3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
index cb9a85f6575..5ddd1107c39 100644
--- a/include/hw/ppc/spapr_irq.h
+++ b/include/hw/ppc/spapr_irq.h
@@ -100,7 +100,6 @@ typedef struct SpaprIrq {
 } SpaprIrq;
 
 extern SpaprIrq spapr_irq_xics;
-extern SpaprIrq spapr_irq_xics_legacy;
 extern SpaprIrq spapr_irq_xive;
 extern SpaprIrq spapr_irq_dual;
 
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 85c27f36535..ebc8e84512a 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3347,9 +3347,7 @@ static char *spapr_get_ic_mode(Object *obj, Error **errp)
 {
     SpaprMachineState *spapr = SPAPR_MACHINE(obj);
 
-    if (spapr->irq == &spapr_irq_xics_legacy) {
-        return g_strdup("legacy");
-    } else if (spapr->irq == &spapr_irq_xics) {
+    if (spapr->irq == &spapr_irq_xics) {
         return g_strdup("xics");
     } else if (spapr->irq == &spapr_irq_xive) {
         return g_strdup("xive");
diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index d6d368dd08c..363bfc00db4 100644
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -588,11 +588,6 @@ int spapr_irq_find(SpaprMachineState *spapr, int num, bool align, Error **errp)
     return first + ics->offset;
 }
 
-SpaprIrq spapr_irq_xics_legacy = {
-    .xics        = true,
-    .xive        = false,
-};
-
 static void spapr_irq_register_types(void)
 {
     type_register_static(&spapr_intc_info);
-- 
2.51.0
next prev parent reply	other threads:[~2025-10-20 10:39 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 ` Philippe Mathieu-Daudé [this message]
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 ` [PATCH 11/18] hw/ppc/spapr: Remove deprecated pseries-4.0 machine Philippe Mathieu-Daudé
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-3-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).