From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 12313A051C; Tue, 11 Feb 2020 02:20:41 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8F9E01BFA8; Tue, 11 Feb 2020 02:20:07 +0100 (CET) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id 42CBE1BF7C for ; Tue, 11 Feb 2020 02:20:06 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id E4F4E21FE6; Mon, 10 Feb 2020 20:20:05 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 10 Feb 2020 20:20:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=4OwBvK0NoM V6228KY+Q+5B541z+rmukxAnkRgyfDWv0=; b=Jxi0DNE10T4v829wnHCdQiCRPL gUpix5lfLMSv+IrNB9FrYpb5n4YvSIkMrohezMG1wiA7Kg9L5Y/hRGWRMWUm2T98 F1KNCQw4B2mM65qln/bEy44gRSqkUqbIhEW7syxoRCC4Vudkgp6mlXX2vulIBowS eRjM8VaqRnZcTyz6k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=4OwBvK0NoMV6228KY+Q+5B541z+rmukxAnkRgyfDWv0=; b=xi/fd9Iu tgQ3Ecpl1PfIfpSAG6HjExQYRXnOcbww34JTnsAN4StSEDfZsuCRrzY/plGhSub0 dBBTKvLIImFPxtXG4MsomnXyuWtc3Prawk2PKKyFsfd5zepM7Dpzb2h9aofURyI1 5qmfAmaH8fFKIaJlHr4xzqtNtugDTPk7KJqoC4N3plk6ShIG0ef1KVfh5OQIZfAK LYJiN38WSHfRBq6w4GJzslA0fmXD2R55Y3ONb0oADuAX1A9smnFdWfuCU9Csy3No mMCKGfh5KXdFenys4I2LTSNEtqfh5ploLXw2dsr6sp2Aqh9et40dNfj/ClQNjR31 LjJ+UVce4VgRww== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedriedvgdefvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucfkph epjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuihiivgepvdenucfrrghr rghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 225B13280059; Mon, 10 Feb 2020 20:20:05 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Cc: bruce.richardson@intel.com, Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko Date: Tue, 11 Feb 2020 02:19:41 +0100 Message-Id: <20200211011942.1569573-5-thomas@monjalon.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200211011942.1569573-1-thomas@monjalon.net> References: <20200127154402.4008069-1-thomas@monjalon.net> <20200211011942.1569573-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 4/5] net/mlx: rename meson variable for dlopen option X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The name of the variable pmd_dlopen is confusing because it can be understood as true if the PMD is dlopen, whereas it means the ibverbs glue layer is a dlopen library. That's why it is renamed dlopen_ibverbs. Signed-off-by: Thomas Monjalon --- drivers/common/mlx5/meson.build | 8 ++++---- drivers/net/mlx4/meson.build | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build index bf04d16d76..2bb2a83c45 100644 --- a/drivers/common/mlx5/meson.build +++ b/drivers/common/mlx5/meson.build @@ -9,11 +9,11 @@ endif build = true static_ibverbs = (get_option('ibverbs_link') == 'static') -pmd_dlopen = (get_option('ibverbs_link') == 'dlopen') +dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen') LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so' LIB_GLUE_VERSION = '20.02.0' LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION -if pmd_dlopen +if dlopen_ibverbs dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) cflags += [ '-DMLX5_GLUE="@0@"'.format(LIB_GLUE), @@ -55,7 +55,7 @@ if build 'mlx5_common.c', 'mlx5_nl.c', ) - if not pmd_dlopen + if not dlopen_ibverbs sources += files('mlx5_glue.c') endif cflags_options = [ @@ -194,7 +194,7 @@ if build configure_file(output : 'mlx5_autoconf.h', configuration : config) endif # Build Glue Library -if pmd_dlopen and build +if dlopen_ibverbs and build dlopen_name = 'mlx5_glue' dlopen_lib_name = 'rte_pmd_@0@'.format(dlopen_name) dlopen_so_version = LIB_GLUE_VERSION diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build index cf53a6b3e1..2970f395c1 100644 --- a/drivers/net/mlx4/meson.build +++ b/drivers/net/mlx4/meson.build @@ -10,11 +10,11 @@ endif build = true static_ibverbs = (get_option('ibverbs_link') == 'static') -pmd_dlopen = (get_option('ibverbs_link') == 'dlopen') +dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen') LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so' LIB_GLUE_VERSION = '18.02.0' LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION -if pmd_dlopen +if dlopen_ibverbs dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) cflags += [ '-DMLX4_GLUE="@0@"'.format(LIB_GLUE), @@ -62,7 +62,7 @@ if build 'mlx4_txq.c', 'mlx4_utils.c', ) - if not pmd_dlopen + if not dlopen_ibverbs sources += files('mlx4_glue.c') endif cflags_options = [ @@ -114,7 +114,7 @@ if build configure_file(output : 'mlx4_autoconf.h', configuration : config) endif # Build Glue Library -if pmd_dlopen and build +if dlopen_ibverbs and build dlopen_name = 'mlx4_glue' dlopen_lib_name = driver_name_fmt.format(dlopen_name) dlopen_so_version = LIB_GLUE_VERSION -- 2.25.0