[05/11] xl: Make set_memory_target return an error code on failure

Commit Message

Paulina Szubarczyk March 30, 2016, 3:02 p.m. UTC

Change a 'long long' to "int64_t" while we're at it.

Signed-off-by: George Dunlap <[e-mail]>
Signed-off-by: Paulina Szubarczyk <[e-mail]>

 - Move rc -> shell return code translation into set_memory_{max,target}
 - Use EXIT_{SUCCESS,FAILURE} for main_mem*() function
 - Use 0/1 as return values of set_memory_{max,target}
 - Use EXIT_{SUCCESS,FAILURE} as exit code for set_memory_{max,target}
 - Note incidental type change in changelog

 CC: Wei Liu <[e-mail]>
 CC: Ian Jackson <[e-mail]>
 CC: Dario Faggioli <[e-mail]>
 CC: Ian Campbell <[e-mail]>
---
 tools/libxl/xl_cmdimpl.c | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

--
1.9.1

Patch

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 173cd28..a7f3956 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3271,17 +3271,20 @@  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) {
         fprintf(stderr, "invalid memory size: %s\n", mem);
-        exit(3);
+        exit(EXIT_FAILURE);
     }

-    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 1;
+    }

-    return rc;
+    return 0;
 }

 int main_memmax(int argc, char **argv)
@@ -3289,7 +3292,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 */
@@ -3298,26 +3300,30 @@  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;
+    if (set_memory_max(domid, mem)) {
+        return EXIT_FAILURE;
     }

-    return 0;
+    return EXIT_SUCCESS;
 }

-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)  {
         fprintf(stderr, "invalid memory size: %s\n", mem);
-        exit(3);
+        exit(EXIT_FAILURE);
+    }
+
+    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 1;
     }

-    libxl_set_memory_target(ctx, domid, memorykb, 0, /* enforce */ 1);
+    return 0;
 }

 int main_memset(int argc, char **argv)
@@ -3333,8 +3339,11 @@  int main_memset(int argc, char **argv)
     domid = find_domain(argv[optind]);
     mem = argv[optind + 1];

-    set_memory_target(domid, mem);
-    return 0;
+    if (set_memory_target(domid, mem)) {
+        return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
 }

 static int cd_insert(uint32_t domid, const char *virtdev, char *phys)