From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 0360AA04E6;
	Fri, 30 Oct 2020 18:45:31 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id 61E8A3421;
	Fri, 30 Oct 2020 18:44:57 +0100 (CET)
Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com
 [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 520812C2D
 for <dev@dpdk.org>; Fri, 30 Oct 2020 18:44:52 +0100 (CET)
Received: from compute2.internal (compute2.nyi.internal [10.202.2.42])
 by mailout.nyi.internal (Postfix) with ESMTP id 083DC5C01A3;
 Fri, 30 Oct 2020 13:44:51 -0400 (EDT)
Received: from mailfrontend2 ([10.202.2.163])
 by compute2.internal (MEProxy); Fri, 30 Oct 2020 13:44:51 -0400
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=fm2; bh=SLQHZ4oISK+Ea
 ZcBn6REcBRcuC4K9L09BvwFbP5o2+Q=; b=ZcHVAJIVRW/01iSAS9BlFfsAbIXET
 7vrXTMZqF+pSOqjXCNtPsZRoRGUxLwv00Hg4CC37Bv5dj/6X7P2N81qb3Oci6ll9
 S6MFqWbJZgyaxi9pnjaE4Bl7U2VJ3iNL9DKHsxdeyIJtERd7avIYeQFEpNK2KULS
 Bkqe0xf2FbjdUIbIjPFBoavKWqR19/DJvjayuHj0g0McjFSpTm/6NoB/XAlK4GKK
 p7U4CZqrvp+Gd9ZXuHcVbbEJnOBoZqT1EsTXZ6+PQ5V+eA2yVvNr4PKAsOc78Esz
 oGDsGbh/ybwdvBgtvzad299m36SCrEC8Cz7J6ZnZA+P2K23juLHOcl9rQ==
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=
 fm1; bh=SLQHZ4oISK+EaZcBn6REcBRcuC4K9L09BvwFbP5o2+Q=; b=OS/1MQWC
 O1Cf021iuXtHTcjPti1MaVN00z4TK5TaHBHvwDVfeTzUF/FAx+QMSfBbThOo/Kd7
 Ufh2wSE9gcupD4tRGG4oBUFOsGmyD8ySyruOVdjAsLVDg/tHEjQ+OHffscSlWveA
 V6jbaxNXYueUOAB+3NKgZpATr1Ga7gQOlNloYawjikmBgksPB4bLz+Yegbz4iN3Z
 pDe/2zOUKk6qbe0Te1vw/LjVly1RgYyR+vqIiuUZEm8oixu6qIwSPMNkuLN0pt5p
 xs8LLiIybkalVooZrRuf5NG5IKR5TUIki9T1kemNQKavpvTVImZ6ahj7dOzWPcJf
 R4oCSWZTbZBTdw==
X-ME-Sender: <xms:ElGcX3PfXAA_vhoOp6cbuS-eBmFReQwrvFva0Z0rHtvWgR2T4T7a5w>
 <xme:ElGcXx-SRpiu1qDWskNsteeqKeDlhv-ATwxw9Dm9fXhpstusiWS4d687SFwt2kxKo
 vLbOXZjQGPEGKNFzQ>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrleehgdellecutefuodetggdotefrodftvf
 curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
 uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd
 ertddtnecuhfhrohhmpefvhhhomhgrshcuofhonhhjrghlohhnuceothhhohhmrghssehm
 ohhnjhgrlhhonhdrnhgvtheqnecuggftrfgrthhtvghrnhepvdehgfeivdejgedtveehfe
 fhteelfefgieevgfffveefjeegtdfguedthedtgeevnecukfhppeejjedrudefgedrvddt
 fedrudekgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh
 hmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvght
X-ME-Proxy: <xmx:ElGcX2RpSMvKUe8xx_12anmgH1tLcI_0znKSakCJN9lFilGhDS_Ssw>
 <xmx:ElGcX7sjmMFs6d7B7SvFlRx03q2f1tIrY1TPLBh7YCw2m1mF5B3Akg>
 <xmx:ElGcX_f8iHRUtxSN414YOqgBDKqrSjQcCihuZltLnWkoWBf9570ZXg>
 <xmx:E1GcXwE4pl3SWLows2zeJQKRq8ORoG-N4Tlt2wIeX0xZ9m0Su1WoTQ>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
 by mail.messagingengine.com (Postfix) with ESMTPA id F01B3306467E;
 Fri, 30 Oct 2020 13:44:49 -0400 (EDT)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com, david.marchand@redhat.com,
 bruce.richardson@intel.com, olivier.matz@6wind.com,
 andrew.rybchenko@oktetlabs.ru, akhil.goyal@nxp.com, jerinj@marvell.com
Date: Fri, 30 Oct 2020 18:44:28 +0100
Message-Id: <20201030174441.1076264-3-thomas@monjalon.net>
X-Mailer: git-send-email 2.28.0
In-Reply-To: <20201030174441.1076264-1-thomas@monjalon.net>
References: <20201026052105.1561859-1-thomas@monjalon.net>
 <20201030174441.1076264-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v6 02/15] kni: move header file from EAL
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

Since the kernel module is not part of EAL anymore,
there is no need to have the common KNI header file in EAL.
The file rte_kni_common.h is moved to librte_kni.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 kernel/linux/kni/meson.build                                  | 2 +-
 lib/librte_eal/linux/include/meson.build                      | 1 -
 lib/librte_kni/meson.build                                    | 2 +-
 lib/{librte_eal/linux/include => librte_kni}/rte_kni_common.h | 0
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename lib/{librte_eal/linux/include => librte_kni}/rte_kni_common.h (100%)

diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index d696347f22..07e0c9dae7 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -18,7 +18,7 @@ custom_target('rte_kni',
 		'src=' + meson.current_source_dir(),
 		'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
 		' -I' + meson.source_root() + '/lib/librte_eal/include' +
-		' -I' + meson.source_root() + '/lib/librte_eal/linux/include' +
+		' -I' + meson.source_root() + '/lib/librte_kni' +
 		' -I' + meson.build_root() +
 		' -I' + meson.current_source_dir(),
 		'modules'],
diff --git a/lib/librte_eal/linux/include/meson.build b/lib/librte_eal/linux/include/meson.build
index 1241894b3c..7d18dd52f1 100644
--- a/lib/librte_eal/linux/include/meson.build
+++ b/lib/librte_eal/linux/include/meson.build
@@ -4,6 +4,5 @@
 includes += include_directories('.')
 
 headers += files(
-        'rte_kni_common.h',
         'rte_os.h',
 )
diff --git a/lib/librte_kni/meson.build b/lib/librte_kni/meson.build
index 963eae6fe0..ad598bb3d0 100644
--- a/lib/librte_kni/meson.build
+++ b/lib/librte_kni/meson.build
@@ -6,5 +6,5 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 	reason = 'only supported on 64-bit linux'
 endif
 sources = files('rte_kni.c')
-headers = files('rte_kni.h')
+headers = files('rte_kni.h', 'rte_kni_common.h')
 deps += ['ethdev', 'pci']
diff --git a/lib/librte_eal/linux/include/rte_kni_common.h b/lib/librte_kni/rte_kni_common.h
similarity index 100%
rename from lib/librte_eal/linux/include/rte_kni_common.h
rename to lib/librte_kni/rte_kni_common.h
-- 
2.28.0