Re: [PATCH] xl: fix vcpus to vnode assignement in config file

[Wei Liu <wei.liu2@citrix.com>]

On Fri, Jul 17, 2015 at 07:15:56PM +0200, Dario Faggioli wrote:
> On Fri, 2015-07-17 at 17:08 +0100, Wei Liu wrote:
> > On Fri, Jul 17, 2015 at 05:57:49PM +0200, Dario Faggioli wrote:
> 
> > > Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
> > > ---
> > > Cc: Wei Liu <wei.liu2@citrix.com>
> > > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > > Cc: Ian Campbell <ian.campbell@citrix.com>
> > 
> > With two issues mentioned below fixed:
> > 
> > Acked-by: Wei Liu <wei.liu2@citrix.com>
> > 
> Thanks.
> 
> > > --- a/tools/libxl/xl_cmdimpl.c
> > > +++ b/tools/libxl/xl_cmdimpl.c
> > > @@ -1076,9 +1076,7 @@ static void parse_vnuma_config(const XLU_Config *config,
> > >      /* Temporary storage for parsed vcpus information to avoid
> > >       * parsing config twice. This array has num_vnuma elements.
> > >       */
> > 
> > Delete this comment as well.
> > 
> Can I ask why? I think it's still accurate, actually...
> 

Actually you're right. Keep it. For some reason my ability to
concentrate is very bad today. :-/

> > > -    struct vcpu_range_parsed {
> > > -        unsigned long start, end;
> > > -    } *vcpu_range_parsed;
> > > +    libxl_bitmap *vcpu_parsed;
> 
> 
> > > @@ -1095,7 +1093,14 @@ static void parse_vnuma_config(const XLU_Config *config,
> > >  
> > >      b_info->num_vnuma_nodes = num_vnuma;
> > >      b_info->vnuma_nodes = xcalloc(num_vnuma, sizeof(libxl_vnode_info));
> > > -    vcpu_range_parsed = xcalloc(num_vnuma, sizeof(*vcpu_range_parsed));
> > > +    vcpu_parsed = xcalloc(num_vnuma, sizeof(libxl_bitmap));
> > > +    for (i = 0; i < num_vnuma; i++) {
> > > +        libxl_bitmap_init(&vcpu_parsed[i]);
> > > +        if (libxl_cpu_bitmap_alloc(ctx, &vcpu_parsed[i], b_info->max_vcpus)) {
> > > +            fprintf(stderr, "libxl_node_bitmap_alloc failed.\n");
> > > +            exit(1);
> > > +        }
> > > +    }
> > >  
> > >      for (i = 0; i < b_info->num_vnuma_nodes; i++) {
> > >          libxl_vnode_info *p = &b_info->vnuma_nodes[i];
> > > @@ -1165,12 +1170,14 @@ static void parse_vnuma_config(const XLU_Config *config,
> > >                      split_string_into_string_list(value, ",", &cpu_spec_list);
> > >                      len = libxl_string_list_length(&cpu_spec_list);
> > >  
> > > -                    for (j = 0; j < len; j++)
> > > +                    for (j = 0; j < len; j++) {
> > >                          parse_range(cpu_spec_list[j], &s, &e);
> > > +                        for (; s <=e; s++) {
> > 
> > Space before e.
> > 
> Bha! Sure, sorry for this.
> 
> Regards,
> Dario
> -- 
> <<This happens because I choose it to happen!>> (Raistlin Majere)
> -----------------------------------------------------------------
> Dario Faggioli, Ph.D, http://about.me/dario.faggioli
> Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)