[PATCH v2 05/11] hw/ppc/spapr: Inline few SPAPR_IRQ_* uses

Philippe Mathieu-Daudé posted 11 patches 3 weeks, 3 days ago
Maintainers: Nicholas Piggin <npiggin@gmail.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Chinmay Rath <rathc@linux.ibm.com>, Paolo Bonzini <pbonzini@redhat.com>
[PATCH v2 05/11] hw/ppc/spapr: Inline few SPAPR_IRQ_* uses
Posted by Philippe Mathieu-Daudé 3 weeks, 3 days ago
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/ppc/spapr_events.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index 548a190ce89..892ddc7f8f7 100644
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -1041,16 +1041,14 @@ void spapr_clear_pending_hotplug_events(SpaprMachineState *spapr)
 
 void spapr_events_init(SpaprMachineState *spapr)
 {
-    int epow_irq = SPAPR_IRQ_EPOW;
-
-    spapr_irq_claim(spapr, epow_irq, false, &error_fatal);
+    spapr_irq_claim(spapr, SPAPR_IRQ_EPOW, false, &error_fatal);
 
     QTAILQ_INIT(&spapr->pending_events);
 
     spapr->event_sources = spapr_event_sources_new();
 
     spapr_event_sources_register(spapr->event_sources, EVENT_CLASS_EPOW,
-                                 epow_irq);
+                                 SPAPR_IRQ_EPOW);
 
     /* NOTE: if machine supports modern/dedicated hotplug event source,
      * we add it to the device-tree unconditionally. This means we may
@@ -1061,12 +1059,10 @@ void spapr_events_init(SpaprMachineState *spapr)
      * checking that it's enabled.
      */
     if (spapr->use_hotplug_event_source) {
-        int hp_irq = SPAPR_IRQ_HOTPLUG;
-
-        spapr_irq_claim(spapr, hp_irq, false, &error_fatal);
+        spapr_irq_claim(spapr, SPAPR_IRQ_HOTPLUG, false, &error_fatal);
 
         spapr_event_sources_register(spapr->event_sources, EVENT_CLASS_HOT_PLUG,
-                                     hp_irq);
+                                     SPAPR_IRQ_HOTPLUG);
     }
 
     spapr->epow_notifier.notify = spapr_powerdown_req;
-- 
2.51.0


Re: [PATCH v2 05/11] hw/ppc/spapr: Inline few SPAPR_IRQ_* uses
Posted by Chinmay Rath 3 weeks, 3 days ago
On 10/21/25 14:13, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/ppc/spapr_events.c | 12 ++++--------
>   1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
> index 548a190ce89..892ddc7f8f7 100644
> --- a/hw/ppc/spapr_events.c
> +++ b/hw/ppc/spapr_events.c
> @@ -1041,16 +1041,14 @@ void spapr_clear_pending_hotplug_events(SpaprMachineState *spapr)
>   
>   void spapr_events_init(SpaprMachineState *spapr)
>   {
> -    int epow_irq = SPAPR_IRQ_EPOW;
> -
> -    spapr_irq_claim(spapr, epow_irq, false, &error_fatal);
> +    spapr_irq_claim(spapr, SPAPR_IRQ_EPOW, false, &error_fatal);
>   
>       QTAILQ_INIT(&spapr->pending_events);
>   
>       spapr->event_sources = spapr_event_sources_new();
>   
>       spapr_event_sources_register(spapr->event_sources, EVENT_CLASS_EPOW,
> -                                 epow_irq);
> +                                 SPAPR_IRQ_EPOW);
>   
>       /* NOTE: if machine supports modern/dedicated hotplug event source,
>        * we add it to the device-tree unconditionally. This means we may
> @@ -1061,12 +1059,10 @@ void spapr_events_init(SpaprMachineState *spapr)
>        * checking that it's enabled.
>        */
>       if (spapr->use_hotplug_event_source) {
> -        int hp_irq = SPAPR_IRQ_HOTPLUG;
> -
> -        spapr_irq_claim(spapr, hp_irq, false, &error_fatal);
> +        spapr_irq_claim(spapr, SPAPR_IRQ_HOTPLUG, false, &error_fatal);
>   
>           spapr_event_sources_register(spapr->event_sources, EVENT_CLASS_HOT_PLUG,
> -                                     hp_irq);
> +                                     SPAPR_IRQ_HOTPLUG);
>       }
>   
>       spapr->epow_notifier.notify = spapr_powerdown_req;
Reviewed-by: Chinmay Rath <rathc@linux.ibm.com>