[Xen-devel,04/13] xen/arm: vgic: Switch from bool_t to bool

Message ID 1481114033-11024-5-git-send-email-julien.grall@arm.com
State New
Headers show

Commit Message

Julien Grall Dec. 7, 2016, 12:33 p.m.
Since commit 9202342 "xen/build: Use C99 booleans", bool_t is an alias
to bool. Going forward, therer is a preference to use bool rather than
bool_t. Also replace 0 and 1 by false and true when relevant.

Signed-off-by: Julien Grall <julien.grall@arm.com>
---
 xen/arch/arm/vgic.c        | 8 ++++----
 xen/include/asm-arm/vgic.h | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

Comments

Stefano Stabellini Dec. 7, 2016, 9:53 p.m. | #1
On Wed, 7 Dec 2016, Julien Grall wrote:
> Since commit 9202342 "xen/build: Use C99 booleans", bool_t is an alias
> to bool. Going forward, therer is a preference to use bool rather than
> bool_t. Also replace 0 and 1 by false and true when relevant.
> 
> Signed-off-by: Julien Grall <julien.grall@arm.com>

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>

> ---
>  xen/arch/arm/vgic.c        | 8 ++++----
>  xen/include/asm-arm/vgic.h | 8 ++++----
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
> index 0965119..84735a9 100644
> --- a/xen/arch/arm/vgic.c
> +++ b/xen/arch/arm/vgic.c
> @@ -482,7 +482,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int virq)
>      uint8_t priority;
>      struct pending_irq *iter, *n = irq_to_pending(v, virq);
>      unsigned long flags;
> -    bool_t running;
> +    bool running;
>  
>      priority = vgic_get_virq_priority(v, virq);
>  
> @@ -555,15 +555,15 @@ int vgic_emulate(struct cpu_user_regs *regs, union hsr hsr)
>      return v->domain->arch.vgic.handler->emulate_sysreg(regs, hsr);
>  }
>  
> -bool_t vgic_reserve_virq(struct domain *d, unsigned int virq)
> +bool vgic_reserve_virq(struct domain *d, unsigned int virq)
>  {
>      if ( virq >= vgic_num_irqs(d) )
> -        return 0;
> +        return false;
>  
>      return !test_and_set_bit(virq, d->arch.vgic.allocated_irqs);
>  }
>  
> -int vgic_allocate_virq(struct domain *d, bool_t spi)
> +int vgic_allocate_virq(struct domain *d, bool spi)
>  {
>      int first, end;
>      unsigned int virq;
> diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h
> index 300f461..1f371c8 100644
> --- a/xen/include/asm-arm/vgic.h
> +++ b/xen/include/asm-arm/vgic.h
> @@ -315,23 +315,23 @@ extern int vgic_to_sgi(struct vcpu *v, register_t sgir,
>  extern void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq);
>  
>  /* Reserve a specific guest vIRQ */
> -extern bool_t vgic_reserve_virq(struct domain *d, unsigned int virq);
> +extern bool vgic_reserve_virq(struct domain *d, unsigned int virq);
>  
>  /*
>   * Allocate a guest VIRQ
>   *  - spi == 0 => allocate a PPI. It will be the same on every vCPU
>   *  - spi == 1 => allocate an SPI
>   */
> -extern int vgic_allocate_virq(struct domain *d, bool_t spi);
> +extern int vgic_allocate_virq(struct domain *d, bool spi);
>  
>  static inline int vgic_allocate_ppi(struct domain *d)
>  {
> -    return vgic_allocate_virq(d, 0 /* ppi */);
> +    return vgic_allocate_virq(d, false /* ppi */);
>  }
>  
>  static inline int vgic_allocate_spi(struct domain *d)
>  {
> -    return vgic_allocate_virq(d, 1 /* spi */);
> +    return vgic_allocate_virq(d, true /* spi */);
>  }
>  
>  extern void vgic_free_virq(struct domain *d, unsigned int virq);
> -- 
> 1.9.1
>

Patch hide | download patch | download mbox

diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 0965119..84735a9 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -482,7 +482,7 @@  void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int virq)
     uint8_t priority;
     struct pending_irq *iter, *n = irq_to_pending(v, virq);
     unsigned long flags;
-    bool_t running;
+    bool running;
 
     priority = vgic_get_virq_priority(v, virq);
 
@@ -555,15 +555,15 @@  int vgic_emulate(struct cpu_user_regs *regs, union hsr hsr)
     return v->domain->arch.vgic.handler->emulate_sysreg(regs, hsr);
 }
 
-bool_t vgic_reserve_virq(struct domain *d, unsigned int virq)
+bool vgic_reserve_virq(struct domain *d, unsigned int virq)
 {
     if ( virq >= vgic_num_irqs(d) )
-        return 0;
+        return false;
 
     return !test_and_set_bit(virq, d->arch.vgic.allocated_irqs);
 }
 
-int vgic_allocate_virq(struct domain *d, bool_t spi)
+int vgic_allocate_virq(struct domain *d, bool spi)
 {
     int first, end;
     unsigned int virq;
diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h
index 300f461..1f371c8 100644
--- a/xen/include/asm-arm/vgic.h
+++ b/xen/include/asm-arm/vgic.h
@@ -315,23 +315,23 @@  extern int vgic_to_sgi(struct vcpu *v, register_t sgir,
 extern void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq);
 
 /* Reserve a specific guest vIRQ */
-extern bool_t vgic_reserve_virq(struct domain *d, unsigned int virq);
+extern bool vgic_reserve_virq(struct domain *d, unsigned int virq);
 
 /*
  * Allocate a guest VIRQ
  *  - spi == 0 => allocate a PPI. It will be the same on every vCPU
  *  - spi == 1 => allocate an SPI
  */
-extern int vgic_allocate_virq(struct domain *d, bool_t spi);
+extern int vgic_allocate_virq(struct domain *d, bool spi);
 
 static inline int vgic_allocate_ppi(struct domain *d)
 {
-    return vgic_allocate_virq(d, 0 /* ppi */);
+    return vgic_allocate_virq(d, false /* ppi */);
 }
 
 static inline int vgic_allocate_spi(struct domain *d)
 {
-    return vgic_allocate_virq(d, 1 /* spi */);
+    return vgic_allocate_virq(d, true /* spi */);
 }
 
 extern void vgic_free_virq(struct domain *d, unsigned int virq);