From: Paulina Szubarczyk <paulinaszubarczyk@gmail.com>
To: xen-devel@lists.xenproject.org, roger.pau@citrix.com,
George.Dunlap@eu.citrix.com
Cc: Paulina Szubarczyk <paulinaszubarczyk@gmail.com>,
dario.faggioli@citrix.com, wei.liu2@citrix.com,
ian.campbell@citrix.com
Subject: [PATCH 08/10] libxl: improve main_tmem_* return codes
Date: Fri, 1 Apr 2016 14:40:11 +0200 [thread overview]
Message-ID: <1459514413-18682-9-git-send-email-paulinaszubarczyk@gmail.com> (raw)
In-Reply-To: <1459514413-18682-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>
---
tools/libxl/xl_cmdimpl.c | 51 ++++++++++++++++++++++++++++++------------------
1 file changed, 32 insertions(+), 19 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 38129f4..52c3b9b 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -7519,7 +7519,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)
@@ -7527,8 +7527,11 @@ 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)
@@ -7548,7 +7551,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)
@@ -7556,8 +7559,11 @@ 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)
@@ -7568,6 +7574,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 r = 0;
SWITCH_FOREACH_OPT(opt, "aw:c:p:", NULL, "tmem-set", 0) {
case 'a':
@@ -7591,7 +7598,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)
@@ -7602,17 +7609,21 @@ 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);
+ r = libxl_tmem_set(ctx, domid, "weight", weight);
if (opt_c)
- libxl_tmem_set(ctx, domid, "cap", cap);
+ r = libxl_tmem_set(ctx, domid, "cap", cap);
if (opt_p)
- libxl_tmem_set(ctx, domid, "compress", compress);
+ r = libxl_tmem_set(ctx, domid, "compress", compress);
- return 0;
+ if (r < 0) {
+ return EXIT_FAILURE;
+ }
+
+ return EXIT_SUCCESS;
}
int main_tmem_shared_auth(int argc, char **argv)
@@ -7642,7 +7653,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)
@@ -7653,18 +7664,20 @@ 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)
@@ -7678,10 +7691,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-04-01 12:41 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-01 12:40 [PATCH 00/10] xl: improve coding style and return more failure on failure for more xl commands Paulina Szubarczyk
2016-04-01 12:40 ` [PATCH 01/10] libxl_pci: improve return codes " Paulina Szubarczyk
2016-04-01 14:00 ` Roger Pau Monné
2016-04-01 12:40 ` [PATCH 02/10] libxl-pci: clean unused return variable Paulina Szubarczyk
2016-04-01 14:13 ` Roger Pau Monné
2016-04-01 12:40 ` [PATCH 03/10] libxl_pci: Return error code for more pci-* functions Paulina Szubarczyk
2016-04-01 14:20 ` Roger Pau Monné
2016-04-01 12:40 ` [PATCH 04/10] xl: improve return code for freemem function Paulina Szubarczyk
2016-04-01 14:24 ` Roger Pau Monné
2016-04-01 12:40 ` [PATCH 05/10] xl_cmdimpl: improve return codes for memset commands Paulina Szubarczyk
2016-04-01 14:33 ` Roger Pau Monné
2016-04-04 11:38 ` George Dunlap
2016-04-01 12:40 ` [PATCH 06/10] xl_cmdimpl: improve return codes for cd-insert commands Paulina Szubarczyk
2016-04-01 14:41 ` Roger Pau Monné
2016-04-01 12:40 ` [PATCH 07/10] Add return codes for pci-detach, pci-attach, pci-asssignable-add, and pci-assignable-remove Paulina Szubarczyk
2016-04-01 12:40 ` Paulina Szubarczyk [this message]
2016-04-01 14:50 ` [PATCH 08/10] libxl: improve main_tmem_* return codes Roger Pau Monné
2016-04-01 15:09 ` Konrad Rzeszutek Wilk
2016-04-01 12:40 ` [PATCH 09/10] libxl: Fix libxl_set_memory_target return value Paulina Szubarczyk
2016-04-01 14:55 ` Roger Pau Monné
2016-04-04 11:40 ` George Dunlap
2016-04-06 10:33 ` Paulina Szubarczyk
2016-04-01 12:40 ` [PATCH 10/10] libxl: libxl_tmem functions improving coding style Paulina Szubarczyk
2016-04-01 15:14 ` Konrad Rzeszutek Wilk
2016-04-01 15:39 ` Roger Pau Monné
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=1459514413-18682-9-git-send-email-paulinaszubarczyk@gmail.com \
--to=paulinaszubarczyk@gmail.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=dario.faggioli@citrix.com \
--cc=ian.campbell@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).