Re: [Xen-devel] [PATCH v3 06/11] arm: handle dom0_max_vcpus=0 case properly

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Fri, 2012-03-02 at 14:27 +0000, Stefano Stabellini wrote:
> From: Ian Campbell <ian.campbell@xxxxxxxxxx>
> 
> Also use xzalloc_array.
> 
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Acked-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>

Committed. Thanks.

> ---
>  xen/arch/arm/domain_build.c |   11 ++++++-----
>  1 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index cbbc0b9..ef52d1d 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -14,13 +14,14 @@ integer_param("dom0_max_vcpus", opt_dom0_max_vcpus);
>  
>  struct vcpu *__init alloc_dom0_vcpu0(void)
>  {
> -    dom0->vcpu = xmalloc_array(struct vcpu *, opt_dom0_max_vcpus);
> +    if ( opt_dom0_max_vcpus == 0 )
> +        opt_dom0_max_vcpus = num_online_cpus();
> +    if ( opt_dom0_max_vcpus > MAX_VIRT_CPUS )
> +        opt_dom0_max_vcpus = MAX_VIRT_CPUS;
> +
> +    dom0->vcpu = xzalloc_array(struct vcpu *, opt_dom0_max_vcpus);
>      if ( !dom0->vcpu )
> -    {
> -            printk("failed to alloc dom0->vccpu\n");
>          return NULL;
> -    }
> -    memset(dom0->vcpu, 0, opt_dom0_max_vcpus * sizeof(*dom0->vcpu));
>      dom0->max_vcpus = opt_dom0_max_vcpus;
>  
>      return alloc_vcpu(dom0, 0, 0);



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