Re: [PATCH v3 3/3] x86/vlapic: a few type adjustments

[Andrew Cooper <andrew.cooper3@citrix.com>]

[-- Attachment #1.1: Type: text/plain, Size: 3158 bytes --]

On 12/09/2014 13:54, Jan Beulich wrote:
> Constify a couple of pointer parameters, convert a boolean function
> return type to bool_t, and clean up a printk() being touched anyway.
>
> Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

>
> --- a/xen/arch/x86/hvm/vlapic.c
> +++ b/xen/arch/x86/hvm/vlapic.c
> @@ -173,9 +173,9 @@ uint32_t vlapic_set_ppr(struct vlapic *v
>      return ppr;
>   }
>   
> -static int vlapic_match_logical_addr(struct vlapic *vlapic, uint32_t mda)
> +static bool_t vlapic_match_logical_addr(const struct vlapic *vlapic, uint32_t mda)
>   {
> -    int result = 0;
> +    bool_t result = 0;
>       uint32_t logical_id = vlapic_get_reg(vlapic, APIC_LDR);
>   
>       if ( vlapic_x2apic_mode(vlapic) )
> @@ -196,9 +196,9 @@ static int vlapic_match_logical_addr(str
>               result = 1;
>           break;
>       default:
> -        gdprintk(XENLOG_WARNING, "Bad DFR value for lapic of vcpu %d: %08x\n",
> -                 vlapic_vcpu(vlapic)->vcpu_id,
> -                 vlapic_get_reg(vlapic, APIC_DFR));
> +        printk(XENLOG_G_WARNING "%pv: bad LAPIC DFR value %08x\n",
> +               const_vlapic_vcpu(vlapic),
> +               vlapic_get_reg(vlapic, APIC_DFR));
>           break;
>       }
>   
> @@ -206,7 +206,7 @@ static int vlapic_match_logical_addr(str
>   }
>   
>   bool_t vlapic_match_dest(
> -    struct vlapic *target, const struct vlapic *source,
> +    const struct vlapic *target, const struct vlapic *source,
>       int short_hand, uint32_t dest, bool_t dest_mode)
>   {
>       HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "target %p, source %p, dest %#x, "
> --- a/xen/include/asm-x86/hvm/vlapic.h
> +++ b/xen/include/asm-x86/hvm/vlapic.h
> @@ -28,6 +28,8 @@
>   
>   #define vcpu_vlapic(x)   (&(x)->arch.hvm_vcpu.vlapic)
>   #define vlapic_vcpu(x)   (container_of((x), struct vcpu, arch.hvm_vcpu.vlapic))
> +#define const_vlapic_vcpu(x) (container_of((x), const struct vcpu, \
> +                              arch.hvm_vcpu.vlapic))
>   #define vlapic_domain(x) (vlapic_vcpu(x)->domain)
>   
>   #define _VLAPIC_ID(vlapic, id) (vlapic_x2apic_mode(vlapic) \
> @@ -85,7 +87,8 @@ struct vlapic {
>   /* vlapic's frequence is 100 MHz */
>   #define APIC_BUS_CYCLE_NS               10
>   
> -static inline uint32_t vlapic_get_reg(struct vlapic *vlapic, uint32_t reg)
> +static inline uint32_t vlapic_get_reg(const struct vlapic *vlapic,
> +                                      uint32_t reg)
>   {
>       return *((uint32_t *)(&vlapic->regs->data[reg]));
>   }
> @@ -129,7 +132,7 @@ struct vlapic *vlapic_lowest_prio(
>       int short_hand, uint32_t dest, bool_t dest_mode);
>   
>   bool_t vlapic_match_dest(
> -    struct vlapic *target, const struct vlapic *source,
> +    const struct vlapic *target, const struct vlapic *source,
>       int short_hand, uint32_t dest, bool_t dest_mode);
>   
>   void vlapic_domain_unpause(const struct domain *);
>
>
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel


[-- Attachment #1.2: Type: text/html, Size: 3967 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel