[dpdk-stable] patch 'vfio: disable in FreeBSD build with meson' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/28/18. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From a3712b5a8328624ec6c94a2ae2a21b1bc87f3828 Mon Sep 17 00:00:00 2001
From: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan at intel.com>
Date: Thu, 4 Oct 2018 15:09:58 +0100
Subject: [PATCH] vfio: disable in FreeBSD build with meson

[ upstream commit afbafdca7cb7f6c42d62881fec9dfb17e07eb099 ]

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")

Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at 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 4d755323f..25542ef8d 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -93,2 +93,5 @@ 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 9ec77efda..e98dc5e29 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -35,5 +35,4 @@
 #define RTE_LOG_DP_LEVEL RTE_LOG_INFO
 #define RTE_BACKTRACE 1
-#define RTE_EAL_VFIO 1
 #define RTE_MAX_VFIO_CONTAINERS 64
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-22 16:47:33.895995203 +0000
+++ 0062-vfio-disable-in-FreeBSD-build-with-meson.patch	2018-11-22 16:47:32.000000000 +0000
@@ -1,8 +1,10 @@
-From afbafdca7cb7f6c42d62881fec9dfb17e07eb099 Mon Sep 17 00:00:00 2001
+From a3712b5a8328624ec6c94a2ae2a21b1bc87f3828 Mon Sep 17 00:00:00 2001
 From: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan at intel.com>
 Date: Thu, 4 Oct 2018 15:09:58 +0100
 Subject: [PATCH] vfio: disable in FreeBSD build with meson
 
+[ upstream commit afbafdca7cb7f6c42d62881fec9dfb17e07eb099 ]
+
 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.
@@ -10,7 +12,6 @@
 based on the platform RTE_EAL_VFIO flag is enabled/disabled appropriately.
 
 Fixes: 844514c735 ("eal: build with meson")
-Cc: stable at dpdk.org
 
 Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan at intel.com>
 Acked-by: Bruce Richardson <bruce.richardson at intel.com>
@@ -20,20 +21,20 @@
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/config/meson.build b/config/meson.build
-index 275f00b60..0b710b795 100644
+index 4d755323f..25542ef8d 100644
 --- a/config/meson.build
 +++ b/config/meson.build
-@@ -104,2 +104,5 @@ dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
+@@ -93,2 +93,5 @@ 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 333fb0be9..d3732e953 100644
+index 9ec77efda..e98dc5e29 100644
 --- a/config/rte_config.h
 +++ b/config/rte_config.h
-@@ -36,5 +36,4 @@
+@@ -35,5 +35,4 @@
  #define RTE_LOG_DP_LEVEL RTE_LOG_INFO
  #define RTE_BACKTRACE 1
 -#define RTE_EAL_VFIO 1