Re: [Xen-devel] [PATCH] xen/evtchn: Cleanup for virq_is_global() infrastructure

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Mon, 29 Jan 2018, Andrew Cooper wrote:
> Switch it, and the arch infrastructure, to return bool.  Drop the unnecessary
> rc parameter, and remove a redundant assertion from send_global_virq().
> 
> No functional change.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>

Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>


> ---
> CC: Jan Beulich <JBeulich@xxxxxxxx>
> CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> CC: Julien Grall <julien.grall@xxxxxxx>
> ---
>  xen/common/event_channel.c  | 21 +++++++--------------
>  xen/include/asm-arm/event.h |  4 ++--
>  xen/include/asm-x86/event.h |  4 ++--
>  3 files changed, 11 insertions(+), 18 deletions(-)
> 
> diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
> index be834c5..4c5ca46 100644
> --- a/xen/common/event_channel.c
> +++ b/xen/common/event_channel.c
> @@ -93,29 +93,23 @@ static uint8_t 
> get_xen_consumer(xen_event_channel_notification_t fn)
>  /* Get the notification function for a given Xen-bound event channel. */
>  #define xen_notification_fn(e) (xen_consumers[(e)->xen_consumer-1])
>  
> -static int virq_is_global(uint32_t virq)
> +static bool virq_is_global(uint32_t virq)
>  {
> -    int rc;
> -
> -    ASSERT(virq < NR_VIRQS);
> -
>      switch ( virq )
>      {
>      case VIRQ_TIMER:
>      case VIRQ_DEBUG:
>      case VIRQ_XENOPROF:
>      case VIRQ_XENPMU:
> -        rc = 0;
> -        break;
> +        return false;
> +
>      case VIRQ_ARCH_0 ... VIRQ_ARCH_7:
> -        rc = arch_virq_is_global(virq);
> -        break;
> +        return arch_virq_is_global(virq);
> +
>      default:
> -        rc = 1;
> -        break;
> +        ASSERT(virq < NR_VIRQS);
> +        return true;
>      }
> -
> -    return rc;
>  }
>  
>  
> @@ -809,7 +803,6 @@ static DEFINE_SPINLOCK(global_virq_handlers_lock);
>  
>  void send_global_virq(uint32_t virq)
>  {
> -    ASSERT(virq < NR_VIRQS);
>      ASSERT(virq_is_global(virq));
>  
>      send_guest_global_virq(global_virq_handlers[virq] ?: hardware_domain, 
> virq);
> diff --git a/xen/include/asm-arm/event.h b/xen/include/asm-arm/event.h
> index caefa50..bfb1899 100644
> --- a/xen/include/asm-arm/event.h
> +++ b/xen/include/asm-arm/event.h
> @@ -54,9 +54,9 @@ static inline void local_event_delivery_enable(void)
>  }
>  
>  /* No arch specific virq definition now. Default to global. */
> -static inline int arch_virq_is_global(int virq)
> +static inline bool arch_virq_is_global(int virq)
>  {
> -    return 1;
> +    return true;
>  }
>  
>  #endif
> diff --git a/xen/include/asm-x86/event.h b/xen/include/asm-x86/event.h
> index a91599d..df0232b 100644
> --- a/xen/include/asm-x86/event.h
> +++ b/xen/include/asm-x86/event.h
> @@ -42,9 +42,9 @@ static inline void local_event_delivery_enable(void)
>  }
>  
>  /* No arch specific virq definition now. Default to global. */
> -static inline int arch_virq_is_global(uint32_t virq)
> +static inline bool arch_virq_is_global(uint32_t virq)
>  {
> -    return 1;
> +    return true;
>  }
>  
>  #endif
> -- 
> 2.1.4
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel