Re: [PATCH] x86: drop MAX_VECTOR definition

[Keir Fraser <keir.xen@gmail.com>]

On 02/07/2013 08:07, "Jan Beulich" <JBeulich@suse.com> wrote:

> .. in favor of NR_VECTORS, as being redundant and as the latter is
> correct in terms of its naming, while the former is off by one.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: Keir Fraser <keir@xen.org>

> --- a/xen/arch/x86/hvm/vlapic.c
> +++ b/xen/arch/x86/hvm/vlapic.c
> @@ -90,10 +90,10 @@ static const unsigned int vlapic_lvt_mas
>      ((vlapic_get_reg(vlapic, APIC_LVTT) & APIC_TIMER_MODE_MASK) \
>       == APIC_TIMER_MODE_TSC_DEADLINE)
>  
> -static int vlapic_find_highest_vector(void *bitmap)
> +static int vlapic_find_highest_vector(const void *bitmap)
>  {
> -    uint32_t *word = bitmap;
> -    int word_offset = MAX_VECTOR / 32;
> +    const uint32_t *word = bitmap;
> +    unsigned int word_offset = NR_VECTORS / 32;
>  
>      /* Work backwards through the bitmap (first 32-bit word in every four).
> */
>      while ( (word_offset != 0) && (word[(--word_offset)*4] == 0) )
> --- a/xen/include/asm-x86/hvm/vlapic.h
> +++ b/xen/include/asm-x86/hvm/vlapic.h
> @@ -26,8 +26,6 @@
>  #include <public/hvm/ioreq.h>
>  #include <asm/hvm/vpt.h>
>  
> -#define MAX_VECTOR      256
> -
>  #define vcpu_vlapic(x)   (&(x)->arch.hvm_vcpu.vlapic)
>  #define vlapic_vcpu(x)   (container_of((x), struct vcpu,
> arch.hvm_vcpu.vlapic))
>  #define vlapic_domain(x) (vlapic_vcpu(x)->domain)
> 
> 
>