From patchwork Wed Apr 20 08:04:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulina Szubarczyk X-Patchwork-Id: 8886781 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 572BC9F39A for ; Wed, 20 Apr 2016 08:07:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 524322025A for ; Wed, 20 Apr 2016 08:07:41 +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 6067B20145 for ; Wed, 20 Apr 2016 08:07:40 +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 1asn8h-0006Mp-8B; Wed, 20 Apr 2016 08:05: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 1asn8g-0006LR-1K for xen-devel@lists.xenproject.org; Wed, 20 Apr 2016 08:05:34 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 21/27-14148-D4837175; Wed, 20 Apr 2016 08:05:33 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRWlGSWpSXmKPExsVyMfS6rq6PhXi 4Qe8+U4vvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPm3h0sBY/VKnq6TjA2MG6T7mLk4hASmMko 8f17KyOIwyLwkkXiz7MfTCCOhEA/q8SvLdOZuxg5gZwYiZMfp0HZlRLLn/9hBbGFBLQkLq1cw QIxaiqTxPKF8xhBEmwCZhIzJ/9kAbFFBMIl3vbvYAYpYhaYwyix/91VNpCEsICXxPopZ8EaWA RUJVZOhIjzCnhLbPhyhxFim5zEyWOTgbZxcHAK+Eh03w8GMYWASi7vyJ3AKLCAkWEVo3pxalF ZapGumV5SUWZ6RkluYmaOrqGBqV5uanFxYnpqTmJSsV5yfu4mRmBgMQDBDsapDc6HGCU5mJRE eVUFxMOF+JLyUyozEosz4otKc1KLDzHKcHAoSfDymwPlBItS01Mr0jJzgCEOk5bg4FES4eUFS fMWFyTmFmemQ6ROMRpzbPl9bS0Tx7ap99YyCbHk5eelSonzPjMDKhUAKc0ozYMbBIu9S4yyUs K8jECnCfEUpBblZpagyr9iFOdgVBLmVQJZyJOZVwK37xXQKUxAp/DfFQU5pSQRISXVwDinwzK m9fw9f4Hg+v1rnmpab5qQJGZ695Jpom/UDdeoheo+/KdY5Rc/dzimffuRtgZ/qlW7YVDZtV2F M71C6uSn3br3qLbrzcbvHV2TWvd92O/6+8bmpsKekreBlhsX1F7ZueWUL6/A2Xfrfk96f63Gp qFc7ugjtckCcVPiZxVdmL1ltdOJFjklluKMREMt5qLiRAAzQJDYuAIAAA== X-Env-Sender: paulinaszubarczyk@gmail.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1461139532!19401509!1 X-Originating-IP: [209.85.215.45] 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 2805 invoked from network); 20 Apr 2016 08:05:32 -0000 Received: from mail-lf0-f45.google.com (HELO mail-lf0-f45.google.com) (209.85.215.45) by server-2.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 20 Apr 2016 08:05:32 -0000 Received: by mail-lf0-f45.google.com with SMTP id g184so35902389lfb.3 for ; Wed, 20 Apr 2016 01:05:32 -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=1+zFq1SwvyNonKdrXYF+mcbZBZXuXi0+ITFjolAgksQ=; b=qtITgoNotnU9ogvvMeXvItrftWjbWuYsm0pOHa4Guvsk7GS1tz4l3jTXxd3i8a7rGQ pAfIC151rCCSnTv1Mxysp57g97FaMUJQC0Q7cskGG6mo1NvFv6QGXNFkJU/3wROsbZ9R aq8hpD57B0nQFIc0VcE9mwAvUPs8l5FCJFUQW/GECvEPTHKtoNWDzgP/YQPagWe2mzSU pWLZwTU+ouRJ4CRZ0TLy1mVwMe16ykJO8vEzLI3/xFg7vbr5x3HBcD/+Ei25wb7h/yJc HkItHcRIawFEJgo4wsmk5mXU6Iw7ogSJIYBhW8tpJTBCXR+rVsAeTdgNoFVyBGS16Yyh KQFg== 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=1+zFq1SwvyNonKdrXYF+mcbZBZXuXi0+ITFjolAgksQ=; b=lRCR7c6DzWPvjrHpjIekxZVl/hzxmJbPTrXq4yP8EvlYXYP/9TN2gT8461FdexvijZ qLO+PiH3Q6z+NbA06UAroYQ9yapQiB2cPxrucEiq1Fn7V971gOTBd4utKVK6R9lYDFGK THw5F3wxwcNPY4qz6UJYwIJztdwiCl7e3H0Y4pOeBBlTfYa/ebXYTVnjtZBkSJ4nT0g3 jC/p8OrwP8n5pDV1ugkspOWAsqAlF1ZMmBAZUkWRuohPXh9Pzho98pgMmdC2dLYfYz9y PUNqvc4ZCe07gg2FDCeaZg5wJDjN+hzJGgX1uL6ASP5TF0RIiNINivrEg0WRTtP/0pno hCdg== X-Gm-Message-State: AOPr4FVa+8lay1k/+oBoS0ErWj2XVpgZhpWjyymcH7wz5mTEPNQZWMCxJkcudjG7zF+Lpg== X-Received: by 10.25.207.73 with SMTP id f70mr2989156lfg.131.1461139532393; Wed, 20 Apr 2016 01:05: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 o10sm820613lbp.47.2016.04.20.01.05.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Apr 2016 01:05:31 -0700 (PDT) From: Paulina Szubarczyk To: xen-devel@lists.xenproject.org, roger.pau@citrix.com, George.Dunlap@eu.citrix.com Date: Wed, 20 Apr 2016 10:04:04 +0200 Message-Id: <1461139444-12342-8-git-send-email-paulinaszubarczyk@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461139444-12342-1-git-send-email-paulinaszubarczyk@gmail.com> References: <1461139444-12342-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 v3 7/7] 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) libxc functions are supposed to, on failure, set errno and alwas return -1 which is the value stored in 'r', therfore use LOG() instead LOGEV() with the 'r' value since the error code is always -1. Signed-off-by: Paulina Szubarczyk --- Changed since v2: * corrected indentation * changed LOGEV()->LOG() --- tools/libxl/libxl.c | 89 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 39 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9130f74..02b6164 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6597,14 +6597,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, - _buf); - if (rc < 0) { - LOGEV(ERROR, rc, "Can not get tmem list"); + r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_LIST, domid, 32768, + use_long, _buf); + if (r < 0) { + LOG(ERROR, "Can not get tmem list"); GC_FREE; return NULL; } @@ -6615,34 +6615,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, - NULL); - if (rc < 0) { - LOGEV(ERROR, rc, "Can not freeze tmem pools"); - GC_FREE; - return ERROR_FAIL; + r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_FREEZE, domid, 0, 0, + NULL); + if (r < 0) { + LOG(ERROR, "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, - NULL); - if (rc < 0) { - LOGEV(ERROR, rc, "Can not thaw tmem pools"); - GC_FREE; - return ERROR_FAIL; + r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_THAW, domid, 0, 0, + NULL); + if (r < 0) { + LOG(ERROR, "Can not thaw tmem pools"); + rc = ERROR_FAIL; + goto out; } + rc = 0; +out: GC_FREE; return rc; } @@ -6661,22 +6665,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) { + LOG(ERROR, "Can not set tmem %s", name); + rc = ERROR_FAIL; + goto out; } + rc = 0; +out: GC_FREE; return rc; } @@ -6684,32 +6690,37 @@ 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) { + LOG(ERROR, "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) { + LOG(ERROR, "Can not get tmem freeable memory"); + rc = ERROR_FAIL; + goto out; } + rc = 0; +out: GC_FREE; return rc; }