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 04/10] xl: improve return code for freemem function
Date: Wed, 6 Apr 2016 13:45:57 +0200 [thread overview]
Message-ID: <1459943163-18697-5-git-send-email-paulinaszubarczyk@gmail.com> (raw)
In-Reply-To: <1459943163-18697-1-git-send-email-paulinaszubarczyk@gmail.com>
- Return 0 or 1 for freemem function
- Correct the condition of checking return values of freemem
Signed-off-by: Paulina Szubarczyk <paulinaszubarczyk@gmail.com>
---
tools/libxl/xl_cmdimpl.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 80908ee..fe27f35 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -2690,30 +2690,30 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info)
rc = libxl_domain_need_memory(ctx, b_info, &need_memkb);
if (rc < 0)
- return rc;
+ return 1;
do {
rc = libxl_get_free_memory(ctx, &free_memkb);
if (rc < 0)
- return rc;
+ return 1;
if (free_memkb >= need_memkb)
return 0;
rc = libxl_set_memory_target(ctx, 0, free_memkb - need_memkb, 1, 0);
if (rc < 0)
- return rc;
+ return 1;
/* wait until dom0 reaches its target, as long as we are making
* progress */
rc = libxl_wait_for_memory_target(ctx, 0, 10);
if (rc < 0)
- return rc;
+ return 1;
retries--;
} while (retries > 0);
- return ERROR_NOMEM;
+ return 1;
}
static void autoconnect_console(libxl_ctx *ctx_ignored,
@@ -2981,7 +2981,7 @@ start:
if (domid_soft_reset == INVALID_DOMID) {
ret = freemem(domid, &d_config.b_info);
- if (ret < 0) {
+ if (ret) {
fprintf(stderr, "failed to free memory for the domain\n");
ret = ERROR_FAIL;
goto error_out;
--
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-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 ` Paulina Szubarczyk [this message]
2016-04-06 11:45 ` [PATCH v2 05/10] xl_cmdimpl: improve return codes for memset commands Paulina Szubarczyk
2016-04-08 8:26 ` 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-5-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 \
/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).