From: George Dunlap <george.dunlap@eu.citrix.com>
To: xen-devel@lists.xen.org
Cc: George Dunlap <george.dunlap@eu.citrix.com>,
Ian Jackson <ian.jackson@citrix.com>,
Wei Liu <wei.liu2@citrix.com>,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH v4 3/5] xl: Make set_memory_target return an error code on failure
Date: Fri, 18 Dec 2015 12:23:43 +0000 [thread overview]
Message-ID: <1450441425-10755-4-git-send-email-george.dunlap@eu.citrix.com> (raw)
In-Reply-To: <1450441425-10755-1-git-send-email-george.dunlap@eu.citrix.com>
Also move the rc -> shell code translation into set_memory_max() to
make the two functions consistent with each other, and with other
similar examples in xl_cmdimpl.c
Change a 'long long' to "int64_t" while we're at it.
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
---
v4:
- Move rc -> shell return code translation into set_memory_{max,target}
- Use EXIT_{SUCCESS,FAILURE} rather than magic constants
- Note incidental type change in changelog
CC: Ian Campbell <ian.campbell@citrix.com>
CC: Ian Jackson <ian.jackson@citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: Konrad Wilk <konrad.wilk@oracle.com>
---
tools/libxl/xl_cmdimpl.c | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index f9933cb..1a8b4a1 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3265,7 +3265,6 @@ static int def_getopt(int argc, char * const argv[],
static int set_memory_max(uint32_t domid, const char *mem)
{
int64_t memorykb;
- int rc;
memorykb = parse_mem_size_kb(mem);
if (memorykb == -1) {
@@ -3273,9 +3272,12 @@ static int set_memory_max(uint32_t domid, const char *mem)
exit(3);
}
- rc = libxl_domain_setmaxmem(ctx, domid, memorykb);
+ if (libxl_domain_setmaxmem(ctx, domid, memorykb)) {
+ fprintf(stderr, "cannot set domid %d static max memory to : %s\n", domid, mem);
+ return EXIT_FAILURE;
+ }
- return rc;
+ return EXIT_SUCCESS;
}
int main_memmax(int argc, char **argv)
@@ -3283,7 +3285,6 @@ int main_memmax(int argc, char **argv)
uint32_t domid;
int opt = 0;
char *mem;
- int rc;
SWITCH_FOREACH_OPT(opt, "", NULL, "mem-max", 2) {
/* No options */
@@ -3292,18 +3293,12 @@ int main_memmax(int argc, char **argv)
domid = find_domain(argv[optind]);
mem = argv[optind + 1];
- rc = set_memory_max(domid, mem);
- if (rc) {
- fprintf(stderr, "cannot set domid %d static max memory to : %s\n", domid, mem);
- return 1;
- }
-
- return 0;
+ return set_memory_max(domid, mem);
}
-static void set_memory_target(uint32_t domid, const char *mem)
+static int set_memory_target(uint32_t domid, const char *mem)
{
- long long int memorykb;
+ int64_t memorykb;
memorykb = parse_mem_size_kb(mem);
if (memorykb == -1) {
@@ -3311,7 +3306,12 @@ static void set_memory_target(uint32_t domid, const char *mem)
exit(3);
}
- libxl_set_memory_target(ctx, domid, memorykb, 0, /* enforce */ 1);
+ if (libxl_set_memory_target(ctx, domid, memorykb, 0, /* enforce */ 1)) {
+ fprintf(stderr, "cannot set domid %d dynamic max memory to : %s\n", domid, mem);
+ return EXIT_FAILURE;
+ }
+
+ return EXIT_SUCCESS;
}
int main_memset(int argc, char **argv)
@@ -3327,8 +3327,7 @@ int main_memset(int argc, char **argv)
domid = find_domain(argv[optind]);
mem = argv[optind + 1];
- set_memory_target(domid, mem);
- return 0;
+ return set_memory_target(domid, mem);
}
static int cd_insert(uint32_t domid, const char *virtdev, char *phys)
--
2.1.4
next prev parent reply other threads:[~2015-12-18 12:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-18 12:23 [PATCH v4 0/5] Return failure on failure for more xl commands George Dunlap
2015-12-18 12:23 ` [PATCH v4 1/5] libxl: Remove pointless hypercall from libxl_set_memory_target George Dunlap
2016-01-04 17:28 ` Ian Jackson
2016-03-24 16:54 ` George Dunlap
2015-12-18 12:23 ` [PATCH v4 2/5] libxl: Fix libxl_set_memory_target return value George Dunlap
2016-01-04 17:37 ` Ian Jackson
2016-01-05 14:54 ` Ian Campbell
2016-01-05 15:21 ` Ian Jackson
2015-12-18 12:23 ` George Dunlap [this message]
2015-12-21 10:52 ` [PATCH v4 3/5] xl: Make set_memory_target return an error code on failure Dario Faggioli
2016-01-04 17:37 ` Ian Jackson
2015-12-18 12:23 ` [PATCH v4 4/5] xl: Return an error on failed cd-insert George Dunlap
2015-12-21 10:52 ` Dario Faggioli
2016-01-04 17:38 ` Ian Jackson
2015-12-18 12:23 ` [PATCH v4 5/5] xl: Return error codes for pci* commands George Dunlap
2015-12-21 10:51 ` Dario Faggioli
2016-01-04 17:40 ` Ian Jackson
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=1450441425-10755-4-git-send-email-george.dunlap@eu.citrix.com \
--to=george.dunlap@eu.citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.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).