From patchwork Fri Apr 1 12:40:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulina Szubarczyk X-Patchwork-Id: 8723541 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7B4109F39A for ; Fri, 1 Apr 2016 12:43:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92C9F203C2 for ; Fri, 1 Apr 2016 12:43:47 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ADEE520303 for ; Fri, 1 Apr 2016 12:43:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alyO8-0001C2-Ep; Fri, 01 Apr 2016 12:41:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alyO6-0001Am-Ly for xen-devel@lists.xenproject.org; Fri, 01 Apr 2016 12:41:18 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 98/4D-02986-C6C6EF65; Fri, 01 Apr 2016 12:41:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRWlGSWpSXmKPExsVyMfS6jm5Ozr8 wg1s7JSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozmGxPYC54IVDRuNWxg7ODpYuTiEBKYyShx fN9+RhCHReAli8TdxztYQRwJgX5WiZUfvjB1MXICOTESB392sHUxcgDZlRJbdheBhIUEtCQur VzBAjFpGpPEjzf/WUASbAJmEjMn/wSzRQTCJd7272AGKWIWaGCU+HdnMdhQYQFniV3TtjKD2C wCqhIzFzWB2bwC3hL/b81mg1gsJ3Hy2GRWEJtTwEfiz6aLjBCbvSXund3MNoFRYAEjwypG9eL UorLUIl1zvaSizPSMktzEzBxdQ0MTvdzU4uLE9NScxKRiveT83E2MwMBiAIIdjF+WOB9ilORg UhLlfWP3L0yILyk/pTIjsTgjvqg0J7X4EKMMB4eSBK95NlBOsCg1PbUiLTMHGOIwaQkOHiURX leQNG9xQWJucWY6ROoUoyXHlt/X1jJxbFlwA0hum3pvLZMQS15+XqqUOC8vSIMASENGaR7cOF gcXmKUlRLmZQQ6UIinILUoN7MEVf4VozgHo5IwrxPIFJ7MvBK4ra+ADmICOqhDGuygkkSElFQ Do8cUVYf8AIFMo54jPsF9P3dOmZe9OUVD89zMNSK5fbHhV96cLTvxldd/NfNpVQu+O8lbGpQT zFvWrz61rfCTbr95Qf/Webz2SrvUeEycf7ovjXS7l7lm889wj03hwad9JkQvP7Nhpz13FMsma Z1r5wwd/e6saMlbPm+R2HcRpeCq/J1dUd/5lFiKMxINtZiLihMBrwuCD74CAAA= X-Env-Sender: paulinaszubarczyk@gmail.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1459514475!35043894!1 X-Originating-IP: [209.85.215.44] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49503 invoked from network); 1 Apr 2016 12:41:16 -0000 Received: from mail-lf0-f44.google.com (HELO mail-lf0-f44.google.com) (209.85.215.44) by server-15.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 1 Apr 2016 12:41:16 -0000 Received: by mail-lf0-f44.google.com with SMTP id p188so53645256lfd.0 for ; Fri, 01 Apr 2016 05:41:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=x9UXd7AeflI5CJ60YTFA2wTJGH3p43kWFh50sWFIsF4=; b=Lc5jBX0vCe+CUjoDLBykw1A8PEYdN+rxKBL3sMle3Mrp1ySbaN+BXAcANAI3bsBD3K Hu9hEWPVihfWmer3rypapewJLdyLJ9BvzfUHfgsPk1bv4AKTn/wmNPX3J2Kt01L3TzVs 47PHOF39HOTfiaouchruPOI4dUuXLcjvqv0gSkdkM7rA2eti/pasYKUrtNmlOrikvXES HN6cvDaUTlqBj9r1oDikTNwYlvs53Jq/Lc7FUdZCMqWh22rEUtH1921fQpjMwhUWp4e2 GqGjdWLGv3W74q7pc3vi6l7HM8z+JZsKTENKHT+8XuUz6u0j3Ub415vVmdEKoJKYeuz9 XUTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=x9UXd7AeflI5CJ60YTFA2wTJGH3p43kWFh50sWFIsF4=; b=QoLRcXNCGudIt8PYMFWdLu43qQWd60WU9OAVtrWOZveceSXajDSAgb4qpLiToumaOJ ldIX0PED8naQUF4T/kcVcRHfpj8HZ9SOzJoCNFIZ8PEu1xgtlsdHK/vCzlZ2ZVAOv5hs mUQXhA16LBsixFWuLN/4B1ZLI9v0GCwToIWc/Zj0eNseH2Xsn0onuut87u3z7rqCZgpW l3QnEQ7lmveAbhRR9+ZL6VhJM877N616IQoT3YfpMpIuLwS5YQ/m7jHO7F9iAj6hn+jg gGyFg5qqtnA4ZYb8DBmOgYlSbtkJAr1RIzsCmzDlRjcSxN0nRJyMDCV6N7QzXokPyOAR W/Qg== X-Gm-Message-State: AD7BkJLQ+W60E6Jt8bT3/C+Rhank5+CB82hZVRVWSIHyvzGjm3RFhBZCu1PemvFiko1ujA== X-Received: by 10.25.145.136 with SMTP id t130mr1168234lfd.4.1459514475463; Fri, 01 Apr 2016 05:41:15 -0700 (PDT) Received: from localhost.localdomain (84-10-74-207.static.chello.pl. [84.10.74.207]) by smtp.gmail.com with ESMTPSA id do4sm2134801lbc.35.2016.04.01.05.41.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Apr 2016 05:41:14 -0700 (PDT) From: Paulina Szubarczyk To: xen-devel@lists.xenproject.org, roger.pau@citrix.com, George.Dunlap@eu.citrix.com Date: Fri, 1 Apr 2016 14:40:07 +0200 Message-Id: <1459514413-18682-5-git-send-email-paulinaszubarczyk@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459514413-18682-1-git-send-email-paulinaszubarczyk@gmail.com> References: <1459514413-18682-1-git-send-email-paulinaszubarczyk@gmail.com> Cc: Paulina Szubarczyk , dario.faggioli@citrix.com, wei.liu2@citrix.com, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH 04/10] xl: improve return code for freemem function X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP - Return 0 or 1 for freemem function - Correct the condition of checking return values of freemem Signed-off-by: Paulina Szubarczyk --- tools/libxl/xl_cmdimpl.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 7750995..7ee6953 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2678,38 +2678,34 @@ static int preserve_domain(uint32_t *r_domid, libxl_event *event, static int freemem(uint32_t domid, libxl_domain_build_info *b_info) { - int rc, retries = 3; + int retries = 3; uint32_t need_memkb, free_memkb; if (!autoballoon) return 0; - rc = libxl_domain_need_memory(ctx, b_info, &need_memkb); - if (rc < 0) - return rc; + if (libxl_domain_need_memory(ctx, b_info, &need_memkb) < 0) + return 1; do { - rc = libxl_get_free_memory(ctx, &free_memkb); - if (rc < 0) - return rc; + if (libxl_get_free_memory(ctx, &free_memkb) < 0) + 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; + if (libxl_set_memory_target(ctx, 0, free_memkb - need_memkb, 1, 0) < 0) + 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; + if (libxl_wait_for_memory_target(ctx, 0, 10) < 0) + return 1; retries--; } while (retries > 0); - return ERROR_NOMEM; + return 1; } static void autoconnect_console(libxl_ctx *ctx_ignored, @@ -2975,7 +2971,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;