xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Paulina Szubarczyk <paulinaszubarczyk@gmail.com>
To: xen-devel@lists.xenproject.org, roger.pau@citrix.com,
	George.Dunlap@eu.citrix.com
Cc: ian.jackson@eu.citrix.com, dario.faggioli@citrix.com,
	wei.liu2@citrix.com, ian.campbell@citrix.com,
	Paulina Szubarczyk <paulinaszubarczyk@gmail.com>
Subject: [PATCH v2 05/10] xl_cmdimpl: improve return codes for memset commands
Date: Wed,  6 Apr 2016 13:45:58 +0200	[thread overview]
Message-ID: <1459943163-18697-6-git-send-email-paulinaszubarczyk@gmail.com> (raw)
In-Reply-To: <1459943163-18697-1-git-send-email-paulinaszubarczyk@gmail.com>

 - Use EXIT_{SUCCESS,FAILURE} for main_mem*() function
 - Use 0/1 as return values of set_memory_{max,target}

Signed-off-by: Paulina Szubarczyk <paulinaszubarczyk@gmail.com>

---
Changed since v1
* Changed exit() calls to 'return 1;'
---
 tools/libxl/xl_cmdimpl.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index fe27f35..ad88b4b 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3391,15 +3391,15 @@ static int set_memory_max(uint32_t domid, const char *mem)
     memorykb = parse_mem_size_kb(mem);
     if (memorykb == -1) {
         fprintf(stderr, "invalid memory size: %s\n", mem);
-        exit(3);
+        return 1;
     }
 
     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 1;
     }
 
-    return EXIT_SUCCESS;
+    return 0;
 }
 
 int main_memmax(int argc, char **argv)
@@ -3415,7 +3415,11 @@ int main_memmax(int argc, char **argv)
     domid = find_domain(argv[optind]);
     mem = argv[optind + 1];
 
-    return set_memory_max(domid, mem);
+    if (set_memory_max(domid, mem)) {
+        return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
 }
 
 static int set_memory_target(uint32_t domid, const char *mem)
@@ -3425,15 +3429,15 @@ static int set_memory_target(uint32_t domid, const char *mem)
     memorykb = parse_mem_size_kb(mem);
     if (memorykb == -1)  {
         fprintf(stderr, "invalid memory size: %s\n", mem);
-        exit(3);
+        return 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 1;
     }
 
-    return EXIT_SUCCESS;
+    return 0;
 }
 
 int main_memset(int argc, char **argv)
@@ -3449,7 +3453,11 @@ int main_memset(int argc, char **argv)
     domid = find_domain(argv[optind]);
     mem = argv[optind + 1];
 
-    return set_memory_target(domid, mem);
+    if (set_memory_target(domid, mem)) {
+        return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
 }
 
 static int cd_insert(uint32_t domid, const char *virtdev, char *phys)
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

  parent reply	other threads:[~2016-04-06 11:47 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-06 11:45 [PATCH v2 00/10] xl: improve coding style and return more failure on failure for more xl commands Paulina Szubarczyk
2016-04-06 11:45 ` [PATCH v2 01/10] libxl_pci: improve return codes " Paulina Szubarczyk
2016-04-08  8:00   ` Dario Faggioli
2016-04-06 11:45 ` [PATCH v2 02/10] libxl-pci: removing the extra 'out_closedir' cleaning path Paulina Szubarczyk
2016-04-08  8:12   ` Dario Faggioli
2016-04-06 11:45 ` [PATCH v2 03/10] libxl: fix return value of libxl__device_pci_destroy_all Paulina Szubarczyk
2016-04-08  8:19   ` Dario Faggioli
2016-04-06 11:45 ` [PATCH v2 04/10] xl: improve return code for freemem function Paulina Szubarczyk
2016-04-06 11:45 ` Paulina Szubarczyk [this message]
2016-04-08  8:26   ` [PATCH v2 05/10] xl_cmdimpl: improve return codes for memset commands Dario Faggioli
2016-04-08  9:04     ` Paulina Szubarczyk
2016-04-08  9:41       ` Dario Faggioli
2016-04-06 11:45 ` [PATCH v2 06/10] xl_cmdimpl: improve return codes for cd-insert commands Paulina Szubarczyk
2016-04-08  8:29   ` Dario Faggioli
2016-04-06 11:46 ` [PATCH v2 07/10] xl_cmdimpl - Add return codes for pci-detach, pci-attach, pci-asssignable-add, and pci-assignable-remove Paulina Szubarczyk
2016-04-08  8:36   ` Dario Faggioli
2016-04-06 11:46 ` [PATCH v2 08/10] libxl: improve main_tmem_* return codes Paulina Szubarczyk
2016-04-08  9:00   ` Dario Faggioli
2016-04-06 11:46 ` [PATCH v2 09/10] libxl: Fix libxl_set_memory_target return value Paulina Szubarczyk
2016-04-06 12:54   ` George Dunlap
2016-04-06 13:21     ` Paulina Szubarczyk
2016-04-06 13:53       ` George Dunlap
2016-04-06 11:46 ` [PATCH v2 10/10] libxl: libxl_tmem functions improving coding style Paulina Szubarczyk
2016-04-08  8:54   ` Dario Faggioli

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=1459943163-18697-6-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=ian.jackson@eu.citrix.com \
    --cc=roger.pau@citrix.com \
    --cc=wei.liu2@citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    --subject='Re: [PATCH v2 05/10] xl_cmdimpl: improve return codes for memset commands' \
    /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

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).