From patchwork Wed Apr 6 11:46:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulina Szubarczyk X-Patchwork-Id: 8761601 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 39583C0553 for ; Wed, 6 Apr 2016 11:49:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 36D09201EF for ; Wed, 6 Apr 2016 11:49:19 +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 2FD2C201C8 for ; Wed, 6 Apr 2016 11:49:18 +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 1anlvr-00049M-Dl; Wed, 06 Apr 2016 11:47:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1anlvq-000480-Lz for xen-devel@lists.xenproject.org; Wed, 06 Apr 2016 11:47:34 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id A9/79-20731-657F4075; Wed, 06 Apr 2016 11:47:34 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsVyMfTmId3Q7yz hBn//yVt83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBnbPy1mKXikUnHjeTtTA+NGqS5GLg4hgRmM Eq+XPWQDcVgEXrJIPPq7ix3EkRDoZ5V42vGWuYuRE8iJkbjweB1jFyMHkF0pMfmvMUhYSEBL4 tLKFSwQk6YySew8OI8FJMEmYCYxc/JPMFtEIFzibf8OZpAiZoE5jBL7311lA0kIC/hILNk9kx 3EZhFQlfi14hYTiM0LFN++5iQrxGI5iZPHJoPZnEDxB0uOM0Fs9pb4/Wwj2wRGgQWMDKsY1Yt Ti8pSi3SN9JKKMtMzSnITM3N0DQ1M9XJTi4sT01NzEpOK9ZLzczcxAkOLAQh2MH7/43SIUZKD SUmUV+gDS7gQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV6nb0A5waLU9NSKtMwcYJDDpCU4eJREe HtB0rzFBYm5xZnpEKlTjMYcW35fW8vEsW3qvbVMQix5+XmpUuK8PCClAiClGaV5cINg0XeJUV ZKmJcR6DQhnoLUotzMElT5V4ziHIxKwrzmIFN4MvNK4Pa9AjqFCeiUemEmkFNKEhFSUg2My7R eVXFtKDec6XSkbO7ksjO3ku/7bzuRHPKp/tl85pzG3yZXjNcXLFz9s22K/Es9gwT/fweMrq2W rY776D333hfRW4yHjq3hF7HYeG/p3f+ZlS/TEqwuemXXb7g428shRbfFS3n2ToaZHNWN12JKN mz4n58vbPRvqc2sztqXOt9DVq/s2s55SomlOCPRUIu5qDgRALij8Wa5AgAA X-Env-Sender: paulinaszubarczyk@gmail.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1459943253!33301304!1 X-Originating-IP: [209.85.217.194] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26632 invoked from network); 6 Apr 2016 11:47:33 -0000 Received: from mail-lb0-f194.google.com (HELO mail-lb0-f194.google.com) (209.85.217.194) by server-12.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 6 Apr 2016 11:47:33 -0000 Received: by mail-lb0-f194.google.com with SMTP id vk4so3573995lbb.1 for ; Wed, 06 Apr 2016 04:47:33 -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=3EAJUcxzTrMQtCLhTqoXfw35V53sa8hFS7yCvYsGSUg=; b=j3wjmbDR5ebj/VcPQzWw/Dl9MNM+nKqE+LCAuvvkO6SgPWOxGm0oWrVZlXjuOdEuIw I6vyYShT9OrrxYm4X/bq47kzE8GWuAn+tuYywSmxNT+dz+FKaPiYTeUO1dwciluJLYq/ TSqnHj/GPflCCz2TILqBWRmf4aGPk+5dK5frjjtiY7Mu8gHk6ogwPnge4DfVxcXjAa1E t8pth2lQJub2WEx3Xr4glYs0TYRF8WmC43t2+BUCgrX1CteAUs+RMo59SksKhf5+HGw7 yVaqFJMlZXUbwNH95lc+Acyvsjk/uTtM+ZHB3ffrygom15kf9BAA1c0kwi0FvQREfjVX bB8w== 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=3EAJUcxzTrMQtCLhTqoXfw35V53sa8hFS7yCvYsGSUg=; b=GcHgVSvs/qw6HnTwb1lPESDnU03JHmqnN0CXpXwubaLM+nLJ140Vz4sdGMSDW7RJ1g 0LmDOY6hZpAUepYYpPAWd+ROkBznOBHgcBVrLtavyuE9yOa26vvmpaVg6uyqYb3cc3A0 z1UTTurlrYNlNFeuGdrFpPqlmqEvWkIr0e769rC6FsSnv2eR8VFxdlK82uZxaoyJ9+Z/ hBT1QmZPd0EGJFfmUivBlXy1RzSoBQhKIqBlMPl9gx5YIHgvKVAZ2JkqDFgkbh+9l9l/ eGSOu1rub+X/Xh50gsabVzoZwEMF5avDIQbLBs5GefBIW4/x4VD6NbnhEJjKxIABSkOu Mgmg== X-Gm-Message-State: AD7BkJJEIEJiYWDeeG4foMfjfjatInXhBTyYCP7toAc+9ZJGWpeBnUyDTOq/DKvvY3N1Vw== X-Received: by 10.112.157.66 with SMTP id wk2mr1250026lbb.53.1459943252991; Wed, 06 Apr 2016 04:47:32 -0700 (PDT) Received: from localhost.localdomain (84-10-74-207.static.chello.pl. [84.10.74.207]) by smtp.gmail.com with ESMTPSA id ke9sm407808lbc.28.2016.04.06.04.47.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Apr 2016 04:47:32 -0700 (PDT) From: Paulina Szubarczyk To: xen-devel@lists.xenproject.org, roger.pau@citrix.com, George.Dunlap@eu.citrix.com Date: Wed, 6 Apr 2016 13:46:03 +0200 Message-Id: <1459943163-18697-11-git-send-email-paulinaszubarczyk@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459943163-18697-1-git-send-email-paulinaszubarczyk@gmail.com> References: <1459943163-18697-1-git-send-email-paulinaszubarczyk@gmail.com> Cc: ian.jackson@eu.citrix.com, dario.faggioli@citrix.com, wei.liu2@citrix.com, ian.campbell@citrix.com, Paulina Szubarczyk Subject: [Xen-devel] [PATCH v2 10/10] libxl: libxl_tmem functions improving coding style 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 In accordance with CODING_SYTLE: - Use 'r' for return values to functions whose return values are a different error space (like xc_tmem_control, xc_tmem_auth) Signed-off-by: Paulina Szubarczyk --- Changed since v1: * Added the error cleanup path 'out'. * Replaced return with set-and-goto statements. --- tools/libxl/libxl.c | 82 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 057366e..bf0c3c3 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6238,14 +6238,14 @@ uint32_t libxl_vm_get_start_time(libxl_ctx *ctx, uint32_t domid) char *libxl_tmem_list(libxl_ctx *ctx, uint32_t domid, int use_long) { - int rc; + int r; char _buf[32768]; GC_INIT(ctx); - rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_LIST, domid, 32768, use_long, + r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_LIST, domid, 32768, use_long, _buf); - if (rc < 0) { - LOGEV(ERROR, rc, "Can not get tmem list"); + if (r < 0) { + LOGEV(ERROR, r, "Can not get tmem list"); GC_FREE; return NULL; } @@ -6256,34 +6256,38 @@ char *libxl_tmem_list(libxl_ctx *ctx, uint32_t domid, int use_long) int libxl_tmem_freeze(libxl_ctx *ctx, uint32_t domid) { - int rc; + int r, rc; GC_INIT(ctx); - rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_FREEZE, domid, 0, 0, + r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_FREEZE, domid, 0, 0, NULL); - if (rc < 0) { - LOGEV(ERROR, rc, "Can not freeze tmem pools"); - GC_FREE; - return ERROR_FAIL; + if (r < 0) { + LOGEV(ERROR, r, "Can not freeze tmem pools"); + rc = ERROR_FAIL; + goto out; } + rc = 0; +out: GC_FREE; return rc; } int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid) { - int rc; + int r, rc; GC_INIT(ctx); - rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_THAW, domid, 0, 0, + r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_THAW, domid, 0, 0, NULL); - if (rc < 0) { - LOGEV(ERROR, rc, "Can not thaw tmem pools"); - GC_FREE; - return ERROR_FAIL; + if (r < 0) { + LOGEV(ERROR, r, "Can not thaw tmem pools"); + rc = ERROR_FAIL; + goto out; } + rc = 0; +out: GC_FREE; return rc; } @@ -6302,22 +6306,24 @@ static int32_t tmem_setop_from_string(char *set_name) int libxl_tmem_set(libxl_ctx *ctx, uint32_t domid, char* name, uint32_t set) { - int rc; + int r, rc; int32_t subop = tmem_setop_from_string(name); GC_INIT(ctx); if (subop == -1) { LOGEV(ERROR, -1, "Invalid set, valid sets are "); - GC_FREE; - return ERROR_INVAL; + rc = ERROR_INVAL; + goto out; } - rc = xc_tmem_control(ctx->xch, -1, subop, domid, set, 0, NULL); - if (rc < 0) { - LOGEV(ERROR, rc, "Can not set tmem %s", name); - GC_FREE; - return ERROR_FAIL; + r = xc_tmem_control(ctx->xch, -1, subop, domid, set, 0, NULL); + if (r < 0) { + LOGEV(ERROR, r, "Can not set tmem %s", name); + rc = ERROR_FAIL; + goto out; } + rc = 0; +out: GC_FREE; return rc; } @@ -6325,32 +6331,36 @@ int libxl_tmem_set(libxl_ctx *ctx, uint32_t domid, char* name, uint32_t set) int libxl_tmem_shared_auth(libxl_ctx *ctx, uint32_t domid, char* uuid, int auth) { - int rc; + int r, rc; GC_INIT(ctx); - rc = xc_tmem_auth(ctx->xch, domid, uuid, auth); - if (rc < 0) { - LOGEV(ERROR, rc, "Can not set tmem shared auth"); - GC_FREE; - return ERROR_FAIL; + r = xc_tmem_auth(ctx->xch, domid, uuid, auth); + if (r < 0) { + LOGEV(ERROR, r, "Can not set tmem shared auth"); + rc = ERROR_FAIL; + goto out; } + rc = 0; +out: GC_FREE; return rc; } int libxl_tmem_freeable(libxl_ctx *ctx) { - int rc; + int r, rc; GC_INIT(ctx); - rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB, -1, 0, 0, 0); - if (rc < 0) { - LOGEV(ERROR, rc, "Can not get tmem freeable memory"); - GC_FREE; - return ERROR_FAIL; + r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB, -1, 0, 0, 0); + if (r < 0) { + LOGEV(ERROR, r, "Can not get tmem freeable memory"); + rc = ERROR_FAIL; + goto out; } + rc = 0; +out: GC_FREE; return rc; }