From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <agalyabx@ecsmtp.ir.intel.com>
Received: from mga18.intel.com (mga18.intel.com [134.134.136.126])
 by dpdk.org (Postfix) with ESMTP id 3BC951B213
 for <dev@dpdk.org>; Wed,  3 Oct 2018 16:00:44 +0200 (CEST)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga007.fm.intel.com ([10.253.24.52])
 by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
 03 Oct 2018 07:00:43 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.54,336,1534834800"; d="scan'208";a="75090188"
Received: from irvmail001.ir.intel.com ([163.33.26.43])
 by fmsmga007.fm.intel.com with ESMTP; 03 Oct 2018 07:00:41 -0700
Received: from wgcvswdev001.ir.intel.com (wgcvswdev001.ir.intel.com
 [10.102.246.100])
 by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id
 w93E0eWS008710; Wed, 3 Oct 2018 15:00:40 +0100
Received: from wgcvswdev001.ir.intel.com (localhost [127.0.0.1])
 by wgcvswdev001.ir.intel.com with ESMTP id w93E0QCc024225;
 Wed, 3 Oct 2018 15:00:26 +0100
Received: (from agalyabx@localhost)
	by wgcvswdev001.ir.intel.com with œ id w93E0Qvt024221;
	Wed, 3 Oct 2018 15:00:26 +0100
From: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
To: dev@dpdk.org
Cc: alejandro.lucero@netronome.com, allain.legacy@windriver.com,
 jasvinder.singh@intel.com, keith.wiles@intel.com, matan@mellanox.com,
 bruce.richardson@intel.com, reshma.pattan@intel.com,
 Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
Date: Wed,  3 Oct 2018 15:00:16 +0100
Message-Id: <1538575221-23873-2-git-send-email-agalyax.babu.radhakrishnan@intel.com>
X-Mailer: git-send-email 1.7.0.7
In-Reply-To: <1538054652-20820-1>
References: <1538054652-20820-1>
Subject: [dpdk-dev] [PATCH v2 1/6] build: fix for FREEBSD build via meson
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>
X-List-Received-Date: Wed, 03 Oct 2018 14:00:44 -0000

FreeBSD compilation was failing through meson build.
RTE_EAL_VFIO is not supported in FreeBSD.
But RTE_EAL_VFIO was enabled for both linux and freebsd.
So RTE_EAL_VFIO is removed from config/rte_config.h and
based on the platform RTE_EAL_VFIO flag is enabled/disabled appropriately.

Fixes: 6e8a721044 ("vfio: export functions even when disabled")

Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>
---
 config/meson.build  | 3 +++
 config/rte_config.h | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/meson.build b/config/meson.build
index 6f9228c87..b95bca018 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -100,3 +100,6 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
 dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
 
 install_headers('rte_config.h', subdir: get_option('include_subdir_arch'))
+
+# enable VFIO only if it is linux OS
+dpdk_conf.set('RTE_EAL_VFIO', host_machine.system() == 'linux')
diff --git a/config/rte_config.h b/config/rte_config.h
index 567051b9c..53c568929 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -34,7 +34,6 @@
 #define RTE_MAX_TAILQ 32
 #define RTE_LOG_DP_LEVEL RTE_LOG_INFO
 #define RTE_BACKTRACE 1
-#define RTE_EAL_VFIO 1
 #define RTE_MAX_VFIO_CONTAINERS 64
 
 /* bsd module defines */
-- 
2.13.6