| Message ID | 1461139444-12342-6-git-send-email-paulinaszubarczyk@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 20/04/16 09:04, Paulina Szubarczyk wrote: > Functions libxl_tmem_freeze(), libxl_tmem_thaw(), libxl_tmem_set() and > libxl_tmem_shared_auth() located in libxl.c file return > ERROR_FAIL/ERROR_INVAL or internal error codes from libxc library > improve main_tmem_* return codes by returning EXIT_{SUCCESS/FAILURE} > accordingly to return codes of those functions. > > Signed-off-by: Paulina Szubarczyk <paulinaszubarczyk@gmail.com> > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > Reviewed-by: Dario Faggioli <dario.faggioli@citrix.com> > Acked-by: Roger Pau Monné <roger.pau@citrix.com> Paulina, These patches are all basically independent, right? If you move as many of the patches which have suitable Acked / Reviewed-by's to the front of the series on the next iteration, then a committer can check in the ones which are ready to be checked in immediately, and subsequent series (if any) can be much shorter. Although at this point it's more complicated because they now also need a release ack to be checked in. :-) -George > --- > tools/libxl/xl_cmdimpl.c | 51 ++++++++++++++++++++++++++++-------------------- > 1 file changed, 30 insertions(+), 21 deletions(-) > > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index 6bef201..d646927 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -7817,11 +7817,11 @@ int main_tmem_list(int argc, char **argv) > > buf = libxl_tmem_list(ctx, domid, use_long); > if (buf == NULL) > - return -1; > + return EXIT_FAILURE; > > printf("%s\n", buf); > free(buf); > - return 0; > + return EXIT_SUCCESS; > } > > int main_tmem_freeze(int argc, char **argv) > @@ -7841,7 +7841,7 @@ int main_tmem_freeze(int argc, char **argv) > if (!dom && all == 0) { > fprintf(stderr, "You must specify -a or a domain id.\n\n"); > help("tmem-freeze"); > - return 1; > + return EXIT_FAILURE; > } > > if (all) > @@ -7849,8 +7849,10 @@ int main_tmem_freeze(int argc, char **argv) > else > domid = find_domain(dom); > > - libxl_tmem_freeze(ctx, domid); > - return 0; > + if (libxl_tmem_freeze(ctx, domid) < 0) > + return EXIT_FAILURE; > + > + return EXIT_SUCCESS; > } > > int main_tmem_thaw(int argc, char **argv) > @@ -7870,7 +7872,7 @@ int main_tmem_thaw(int argc, char **argv) > if (!dom && all == 0) { > fprintf(stderr, "You must specify -a or a domain id.\n\n"); > help("tmem-thaw"); > - return 1; > + return EXIT_FAILURE; > } > > if (all) > @@ -7878,8 +7880,10 @@ int main_tmem_thaw(int argc, char **argv) > else > domid = find_domain(dom); > > - libxl_tmem_thaw(ctx, domid); > - return 0; > + if (libxl_tmem_thaw(ctx, domid) < 0) > + return EXIT_FAILURE; > + > + return EXIT_SUCCESS; > } > > int main_tmem_set(int argc, char **argv) > @@ -7890,6 +7894,7 @@ int main_tmem_set(int argc, char **argv) > int opt_w = 0, opt_c = 0, opt_p = 0; > int all = 0; > int opt; > + int rc = 0; > > SWITCH_FOREACH_OPT(opt, "aw:c:p:", NULL, "tmem-set", 0) { > case 'a': > @@ -7913,7 +7918,7 @@ int main_tmem_set(int argc, char **argv) > if (!dom && all == 0) { > fprintf(stderr, "You must specify -a or a domain id.\n\n"); > help("tmem-set"); > - return 1; > + return EXIT_FAILURE; > } > > if (all) > @@ -7924,17 +7929,20 @@ int main_tmem_set(int argc, char **argv) > if (!opt_w && !opt_c && !opt_p) { > fprintf(stderr, "No set value specified.\n\n"); > help("tmem-set"); > - return 1; > + return EXIT_FAILURE; > } > > if (opt_w) > - libxl_tmem_set(ctx, domid, "weight", weight); > + rc = libxl_tmem_set(ctx, domid, "weight", weight); > if (opt_c) > - libxl_tmem_set(ctx, domid, "cap", cap); > + rc = libxl_tmem_set(ctx, domid, "cap", cap); > if (opt_p) > - libxl_tmem_set(ctx, domid, "compress", compress); > + rc = libxl_tmem_set(ctx, domid, "compress", compress); > > - return 0; > + if (rc < 0) > + return EXIT_FAILURE; > + > + return EXIT_SUCCESS; > } > > int main_tmem_shared_auth(int argc, char **argv) > @@ -7964,7 +7972,7 @@ int main_tmem_shared_auth(int argc, char **argv) > if (!dom && all == 0) { > fprintf(stderr, "You must specify -a or a domain id.\n\n"); > help("tmem-shared-auth"); > - return 1; > + return EXIT_FAILURE; > } > > if (all) > @@ -7975,18 +7983,19 @@ int main_tmem_shared_auth(int argc, char **argv) > if (uuid == NULL || autharg == NULL) { > fprintf(stderr, "No uuid or auth specified.\n\n"); > help("tmem-shared-auth"); > - return 1; > + return EXIT_FAILURE; > } > > auth = strtol(autharg, &endptr, 10); > if (*endptr != '\0') { > fprintf(stderr, "Invalid auth, valid auth are <0|1>.\n\n"); > - return 1; > + return EXIT_FAILURE; > } > > - libxl_tmem_shared_auth(ctx, domid, uuid, auth); > + if (libxl_tmem_shared_auth(ctx, domid, uuid, auth) < 0) > + return EXIT_FAILURE; > > - return 0; > + return EXIT_SUCCESS; > } > > int main_tmem_freeable(int argc, char **argv) > @@ -8000,10 +8009,10 @@ int main_tmem_freeable(int argc, char **argv) > > mb = libxl_tmem_freeable(ctx); > if (mb == -1) > - return -1; > + return EXIT_FAILURE; > > printf("%d\n", mb); > - return 0; > + return EXIT_SUCCESS; > } > > int main_cpupoolcreate(int argc, char **argv) >
On Wed, Apr 20, 2016 at 10:04:02AM +0200, Paulina Szubarczyk wrote: > Functions libxl_tmem_freeze(), libxl_tmem_thaw(), libxl_tmem_set() and > libxl_tmem_shared_auth() located in libxl.c file return > ERROR_FAIL/ERROR_INVAL or internal error codes from libxc library > improve main_tmem_* return codes by returning EXIT_{SUCCESS/FAILURE} > accordingly to return codes of those functions. > > Signed-off-by: Paulina Szubarczyk <paulinaszubarczyk@gmail.com> > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > Reviewed-by: Dario Faggioli <dario.faggioli@citrix.com> > Acked-by: Roger Pau Monné <roger.pau@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com>
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 6bef201..d646927 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7817,11 +7817,11 @@ int main_tmem_list(int argc, char **argv) buf = libxl_tmem_list(ctx, domid, use_long); if (buf == NULL) - return -1; + return EXIT_FAILURE; printf("%s\n", buf); free(buf); - return 0; + return EXIT_SUCCESS; } int main_tmem_freeze(int argc, char **argv) @@ -7841,7 +7841,7 @@ int main_tmem_freeze(int argc, char **argv) if (!dom && all == 0) { fprintf(stderr, "You must specify -a or a domain id.\n\n"); help("tmem-freeze"); - return 1; + return EXIT_FAILURE; } if (all) @@ -7849,8 +7849,10 @@ int main_tmem_freeze(int argc, char **argv) else domid = find_domain(dom); - libxl_tmem_freeze(ctx, domid); - return 0; + if (libxl_tmem_freeze(ctx, domid) < 0) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } int main_tmem_thaw(int argc, char **argv) @@ -7870,7 +7872,7 @@ int main_tmem_thaw(int argc, char **argv) if (!dom && all == 0) { fprintf(stderr, "You must specify -a or a domain id.\n\n"); help("tmem-thaw"); - return 1; + return EXIT_FAILURE; } if (all) @@ -7878,8 +7880,10 @@ int main_tmem_thaw(int argc, char **argv) else domid = find_domain(dom); - libxl_tmem_thaw(ctx, domid); - return 0; + if (libxl_tmem_thaw(ctx, domid) < 0) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } int main_tmem_set(int argc, char **argv) @@ -7890,6 +7894,7 @@ int main_tmem_set(int argc, char **argv) int opt_w = 0, opt_c = 0, opt_p = 0; int all = 0; int opt; + int rc = 0; SWITCH_FOREACH_OPT(opt, "aw:c:p:", NULL, "tmem-set", 0) { case 'a': @@ -7913,7 +7918,7 @@ int main_tmem_set(int argc, char **argv) if (!dom && all == 0) { fprintf(stderr, "You must specify -a or a domain id.\n\n"); help("tmem-set"); - return 1; + return EXIT_FAILURE; } if (all) @@ -7924,17 +7929,20 @@ int main_tmem_set(int argc, char **argv) if (!opt_w && !opt_c && !opt_p) { fprintf(stderr, "No set value specified.\n\n"); help("tmem-set"); - return 1; + return EXIT_FAILURE; } if (opt_w) - libxl_tmem_set(ctx, domid, "weight", weight); + rc = libxl_tmem_set(ctx, domid, "weight", weight); if (opt_c) - libxl_tmem_set(ctx, domid, "cap", cap); + rc = libxl_tmem_set(ctx, domid, "cap", cap); if (opt_p) - libxl_tmem_set(ctx, domid, "compress", compress); + rc = libxl_tmem_set(ctx, domid, "compress", compress); - return 0; + if (rc < 0) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } int main_tmem_shared_auth(int argc, char **argv) @@ -7964,7 +7972,7 @@ int main_tmem_shared_auth(int argc, char **argv) if (!dom && all == 0) { fprintf(stderr, "You must specify -a or a domain id.\n\n"); help("tmem-shared-auth"); - return 1; + return EXIT_FAILURE; } if (all) @@ -7975,18 +7983,19 @@ int main_tmem_shared_auth(int argc, char **argv) if (uuid == NULL || autharg == NULL) { fprintf(stderr, "No uuid or auth specified.\n\n"); help("tmem-shared-auth"); - return 1; + return EXIT_FAILURE; } auth = strtol(autharg, &endptr, 10); if (*endptr != '\0') { fprintf(stderr, "Invalid auth, valid auth are <0|1>.\n\n"); - return 1; + return EXIT_FAILURE; } - libxl_tmem_shared_auth(ctx, domid, uuid, auth); + if (libxl_tmem_shared_auth(ctx, domid, uuid, auth) < 0) + return EXIT_FAILURE; - return 0; + return EXIT_SUCCESS; } int main_tmem_freeable(int argc, char **argv) @@ -8000,10 +8009,10 @@ int main_tmem_freeable(int argc, char **argv) mb = libxl_tmem_freeable(ctx); if (mb == -1) - return -1; + return EXIT_FAILURE; printf("%d\n", mb); - return 0; + return EXIT_SUCCESS; } int main_cpupoolcreate(int argc, char **argv)
Functions libxl_tmem_freeze(), libxl_tmem_thaw(), libxl_tmem_set() and libxl_tmem_shared_auth() located in libxl.c file return ERROR_FAIL/ERROR_INVAL or internal error codes from libxc library improve main_tmem_* return codes by returning EXIT_{SUCCESS/FAILURE} accordingly to return codes of those functions. Signed-off-by: Paulina Szubarczyk <paulinaszubarczyk@gmail.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Dario Faggioli <dario.faggioli@citrix.com> Acked-by: Roger Pau Monné <roger.pau@citrix.com> --- tools/libxl/xl_cmdimpl.c | 51 ++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 21 deletions(-)