]> xenbits.xensource.com Git - xen.git/commitdiff
evtchn: build fix for Arm
authorJan Beulich <jbeulich@suse.com>
Thu, 4 Jul 2024 14:59:03 +0000 (16:59 +0200)
committerJan Beulich <jbeulich@suse.com>
Thu, 4 Jul 2024 14:59:03 +0000 (16:59 +0200)
When backporting daa90dfea917 ("pirq_cleanup_check() leaks") I neglected
to pay attention to it depending on 13a7b0f9f747 ("restrict concept of
pIRQ to x86"). That one doesn't want backporting imo, so use / adjust
custom #ifdef-ary to address the immediate issue of pirq_cleanup_check()
not being available on Arm.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
xen/common/event_channel.c

index 7eb719f0deb15055356aa7e807d2fb449e25bc32..7b59535ee397c8ce30b1a51c452094c1b4871277 100644 (file)
@@ -618,7 +618,9 @@ static int evtchn_bind_pirq(evtchn_bind_pirq_t *bind)
     if ( rc != 0 )
     {
         info->evtchn = 0;
+#ifdef CONFIG_X86
         pirq_cleanup_check(info, d);
+#endif
         goto out;
     }
 
@@ -688,8 +690,8 @@ int evtchn_close(struct domain *d1, int port1, bool guest)
                  * The successful path of unmap_domain_pirq_emuirq() will have
                  * called pirq_cleanup_check() already.
                  */
-#endif
                 pirq_cleanup_check(pirq, d1);
+#endif
         }
         unlink_pirq_port(chn1, d1->vcpu[chn1->notify_vcpu_id]);
         break;