Re: [PATCH 3/3] xl: convert cpupool related return codes to EXIT_[SUCCESS|FAILURE]

[Dario Faggioli <dario.faggioli@citrix.com>]

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

And here we are at the last patch of this series.

Allow me to say that this is quite good a first contribution! Thanks
for this, and I'm looking forward to seeing version 2!! :-D

About this patch, a few comments below.

On Fri, 2015-10-23 at 13:18 +0530, Harmandeep Kaur wrote:
> turning  cpupools related functions xl exit codes towards using the
> EXIT_[SUCCESS|FAILURE] macros, instead of instead of arbitrary
> numbers
> or libxl return codes.
> 
> Signed-off-by: Harmandeep Kaur <write.harmandeep@gmail.com>

> --- a/tools/libxl/xl_cmdimpl.c
> +++ b/tools/libxl/xl_cmdimpl.c
> @@ -7497,7 +7497,7 @@ out:
>      free(name);
>      free(config_data);
>      free(extra_config);
> -    return rc;
> +    return rc ? EXIT_FAILURE : EXIT_SUCCESS;
>  }
> 
I think you can just initialize rc with EXIT_FAILURE, assign
EXIT_SUCCESS to it near the end, if everything went ok, and then keep
the 'return rc';
  
>  int main_cpupooldestroy(int argc, char **argv)
> @@ -7580,13 +7580,13 @@ int main_cpupooldestroy(int argc, char
> **argv)
>      if (libxl_cpupool_qualifier_to_cpupoolid(ctx, pool, &poolid,
> NULL) ||
>          !libxl_cpupoolid_is_valid(ctx, poolid)) {
>          fprintf(stderr, "unknown cpupool '%s'\n", pool);
> -        return 1;
> +        return EXIT_FAILURE;
>      }
>  
>      if (libxl_cpupool_destroy(ctx, poolid))
> -        return 1;
> +        return EXIT_FAILURE;
>  
> -    return 0;
> +    return EXIT_SUCCESS;
>  }
> 
For this one: I've sent a patch for another reason yesterday, and while
there I did the exit code adjustment myself. So, update your tree and,
if my patch has been committed already, just skip this function.

 https://www.mail-archive.com/xen-devel@lists.xen.org/msg42850.html

Which brings up a question: what git tree are you using for
development? You should stay either on master or staging branches (and
I recommend staging) of the official repository:

 http://wiki.xenproject.org/wiki/Xen_Project_Repositories
 
> @@ -7653,7 +7653,7 @@ int main_cpupoolcpuadd(int argc, char **argv)
>  
>  out:
>      libxl_bitmap_dispose(&cpumap);
> -    return rc;
> +    return rc ? EXIT_FAILURE : EXIT_SUCCESS;
>
Same as already said for main_cpupoolcreate, just us rc.

> @@ -7691,7 +7691,7 @@ int main_cpupoolcpuremove(int argc, char
> **argv)
>  
>  out:
>      libxl_bitmap_dispose(&cpumap);
> -    return rc;
> +    return rc ? EXIT_FAILURE : EXIT_SUCCESS;
>
And here.

>  int main_cpupoolnumasplit(int argc, char **argv)
> @@ -7758,7 +7758,7 @@ int main_cpupoolnumasplit(int argc, char
> **argv)
>      poolinfo = libxl_list_cpupool(ctx, &n_pools);
>      if (!poolinfo) {
>          fprintf(stderr, "error getting cpupool info\n");
> -        return 1;
> +        return EXIT_FAILURE;
>      }
>      poolid = poolinfo[0].poolid;
>      sched = poolinfo[0].sched;
> @@ -7766,13 +7766,13 @@ int main_cpupoolnumasplit(int argc, char
> **argv)
>  
>      if (n_pools > 1) {
>          fprintf(stderr, "splitting not possible, already cpupools in
> use\n");
> -        return 1;
> +        return EXIT_FAILURE;
>      }
>  
>      topology = libxl_get_cpu_topology(ctx, &n_cpus);
>      if (topology == NULL) {
>          fprintf(stderr, "libxl_get_topologyinfo failed\n");
> -        return 1;
> +        return EXIT_FAILURE;
>      }
>  
>      if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) {
> @@ -7869,7 +7869,7 @@ out:
>      libxl_dominfo_dispose(&info);
>      free(name);
>  
> -    return rc;
> +    return rc ? EXIT_FAILURE : EXIT_SUCCESS;
>  }
> 
And here too.

Thanks and 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)


[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

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

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