From afbafdca7cb7f6c42d62881fec9dfb17e07eb099 Mon Sep 17 00:00:00 2001 From: Agalya Babu RadhaKrishnan Date: Thu, 4 Oct 2018 15:09:58 +0100 Subject: [PATCH] vfio: disable in FreeBSD build with meson 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: 844514c735 ("eal: build with meson") Cc: stable@dpdk.org Signed-off-by: Agalya Babu RadhaKrishnan Acked-by: Bruce Richardson --- 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 275f00b60d..0b710b7959 100644 --- a/config/meson.build +++ b/config/meson.build @@ -103,3 +103,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 333fb0be95..d3732e9533 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -35,7 +35,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 */