common/iavf: build on Windows

Enable IAVF driver to build on Windows as it is required
to build ice PMD.
Disable all other drivers from common directory.

This patch also includes fix for a macro redefinition warning
in the IAVF driver.

Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
Acked-by: Jie Zhou <jizh@microsoft.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/drivers/common/cpt/meson.build b/drivers/common/cpt/meson.build
index beecf0d..1127267 100644 (file)
--- a/drivers/common/cpt/meson.build
+++ b/drivers/common/cpt/meson.build
@@ -1,6 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Cavium, Inc
 
+if is_windows
+       build = false
+       reason = 'not supported on Windows'
+       subdir_done()
+endif
+
 sources = files('cpt_fpm_tables.c',
                'cpt_pmd_ops_helper.c')
 

diff --git a/drivers/common/iavf/iavf_osdep.h b/drivers/common/iavf/iavf_osdep.h
index eaefde8..76c186a 100644 (file)
--- a/drivers/common/iavf/iavf_osdep.h
+++ b/drivers/common/iavf/iavf_osdep.h
@@ -55,6 +55,15 @@ typedef uint64_t        s64;
 #define __be64          uint64_t
 #endif
 
+/* Avoid macro redefinition warning on Windows */
+#ifdef RTE_EXEC_ENV_WINDOWS
+#ifdef min
+#undef min
+#endif
+#ifdef max
+#undef max
+#endif
+#endif
 #define min(a, b) RTE_MIN(a, b)
 #define max(a, b) RTE_MAX(a, b)
 

diff --git a/drivers/common/meson.build b/drivers/common/meson.build
index 66e1214..9fdfc24 100644 (file)
--- a/drivers/common/meson.build
+++ b/drivers/common/meson.build
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Cavium, Inc
 
-if is_windows
-       subdir_done()
-endif
-
 std_deps = ['eal']
 drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2']

diff --git a/drivers/common/mvep/meson.build b/drivers/common/mvep/meson.build
index 7cd968b..a929e23 100644 (file)
--- a/drivers/common/mvep/meson.build
+++ b/drivers/common/mvep/meson.build
@@ -4,6 +4,12 @@
 # All rights reserved.
 #
 
+if is_windows
+       build = false
+       reason = 'not supported on Windows'
+       subdir_done()
+endif
+
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
        build = false

diff --git a/drivers/common/octeontx/meson.build b/drivers/common/octeontx/meson.build
index 203d1ef..02b57b9 100644 (file)
--- a/drivers/common/octeontx/meson.build
+++ b/drivers/common/octeontx/meson.build
@@ -2,4 +2,10 @@
 # Copyright(c) 2018 Cavium, Inc
 #
 
+if is_windows
+       build = false
+       reason = 'not supported on Windows'
+       subdir_done()
+endif
+
 sources = files('octeontx_mbox.c')

diff --git a/drivers/common/octeontx2/meson.build b/drivers/common/octeontx2/meson.build
index 84fb115..97293d1 100644 (file)
--- a/drivers/common/octeontx2/meson.build
+++ b/drivers/common/octeontx2/meson.build
@@ -2,6 +2,12 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #
 
+if is_windows
+       build = false
+       reason = 'not supported on Windows'
+       subdir_done()
+endif
+
 if not dpdk_conf.get('RTE_ARCH_64')
        build = false
        reason = 'only supported on 64-bit'

diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index 67f7aca..3ad7dd5 100644 (file)
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -1,6 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2018 Intel Corporation
 
+if is_windows
+       build = false
+       reason = 'not supported on Windows'
+       subdir_done()
+endif
+
 qat_crypto = true
 qat_crypto_path = 'crypto/qat'
 qat_crypto_relpath = '../../' + qat_crypto_path