From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8FE4E1B49C for ; Thu, 22 Nov 2018 17:53:28 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 00BF430832D2; Thu, 22 Nov 2018 16:53:28 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F7FD60E3F; Thu, 22 Nov 2018 16:53:26 +0000 (UTC) From: Kevin Traynor To: Agalya Babu RadhaKrishnan Cc: Bruce Richardson , dpdk stable Date: Thu, 22 Nov 2018 16:49:54 +0000 Message-Id: <20181122164957.13003-62-ktraynor@redhat.com> In-Reply-To: <20181122164957.13003-1-ktraynor@redhat.com> References: <20181122164957.13003-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 22 Nov 2018 16:53:28 +0000 (UTC) Subject: [dpdk-stable] patch 'vfio: disable in FreeBSD build with meson' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 16:53:29 -0000 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 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 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 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 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@dpdk.org Signed-off-by: Agalya Babu RadhaKrishnan Acked-by: Bruce Richardson @@ -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