From: Paulina Szubarczyk <paulinaszubarczyk@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: wei.liu2@citrix.com, George.Dunlap@eu.citrix.com,
Paulina Szubarczyk <paulinaszubarczyk@gmail.com>,
dario.faggioli@citrix.com, ian.jackson@eu.citrix.com,
roger.pau@citrix.com
Subject: [PATCH v4 2/7] xl: improve main_tmem_* return codes
Date: Mon, 9 May 2016 13:30:53 +0200 [thread overview]
Message-ID: <1462793458-27170-3-git-send-email-paulinaszubarczyk@gmail.com> (raw)
In-Reply-To: <1462793458-27170-1-git-send-email-paulinaszubarczyk@gmail.com>
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>
---
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 0e5826b..aedf613 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -7821,11 +7821,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)
@@ -7845,7 +7845,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)
@@ -7853,8 +7853,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)
@@ -7874,7 +7876,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)
@@ -7882,8 +7884,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)
@@ -7894,6 +7898,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':
@@ -7917,7 +7922,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)
@@ -7928,17 +7933,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)
@@ -7968,7 +7976,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)
@@ -7979,18 +7987,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)
@@ -8004,10 +8013,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)
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-05-09 11:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-09 11:30 [PATCH v4 00/10] xl: improve coding style and return more failure on Paulina Szubarczyk
2016-05-09 11:30 ` [PATCH v4 1/7] xl_cmdimpl - Add return codes for pci-detach, pci-attach, pci-asssignable-add, and pci-assignable-remove Paulina Szubarczyk
2016-06-09 14:44 ` Wei Liu
2016-06-09 14:53 ` Paulina Szubarczyk
2016-06-09 15:50 ` Wei Liu
2016-05-09 11:30 ` Paulina Szubarczyk [this message]
2016-05-09 11:30 ` [PATCH v4 3/7] xl_cmdimpl: improve return codes for cd-insert commands Paulina Szubarczyk
2016-05-09 13:02 ` Wei Liu
2016-05-09 11:30 ` [PATCH v4 4/7] libxl: Fix libxl_set_memory_target return value Paulina Szubarczyk
2016-05-09 13:02 ` Wei Liu
2016-05-09 11:30 ` [PATCH v4 5/7] libxl: improve return codes for some pci related functions Paulina Szubarczyk
2016-05-09 13:02 ` Wei Liu
2016-05-09 11:30 ` [PATCH v4 6/7] libxl: style cleanups in libxl_device_pci_assignable_list() Paulina Szubarczyk
2016-05-09 13:02 ` Wei Liu
2016-05-09 11:30 ` [PATCH v4 7/7] libxl: libxl_tmem functions improving coding style Paulina Szubarczyk
2016-05-09 13:02 ` Wei Liu
2016-05-09 13:06 ` [PATCH v4 00/10] xl: improve coding style and return more failure on Wei Liu
2016-05-09 13:25 ` Paulina Szubarczyk
2016-05-09 13:31 ` Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462793458-27170-3-git-send-email-paulinaszubarczyk@gmail.com \
--to=paulinaszubarczyk@gmail.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=dario.faggioli@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=roger.pau@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).