[dpdk-stable] patch 'eal: remove Windows-specific list of common files' has been queued to stable release 20.11.4
Xueming Li
xuemingl at nvidia.com
Wed Nov 10 07:29:25 CET 2021
Hi,
FYI, your patch has been queued to stable release 20.11.4
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/12/21. 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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk
This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/51a9cd2327f3bc2f1d0535e140d94f2ae48ef3bd
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 51a9cd2327f3bc2f1d0535e140d94f2ae48ef3bd Mon Sep 17 00:00:00 2001
From: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Date: Sun, 29 Aug 2021 05:16:01 +0300
Subject: [PATCH] eal: remove Windows-specific list of common files
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit cf665406b1f834baf3436bb6e829b38efca55fd9 ]
The majority of common EAL sources that are built for all platforms were
listed separately for Windows and for other OS. It seems that developers
adding modules to EAL perceived this as if Windows supported
only a limited subset of modules and only added new ones into another.
Factor the truly common modules into a shared list,
then extend it with modules supported by different platforms.
When the two lists were created, UUID API implementation was removed
from Windows build (apparently by mistake), then excluded from the
export list for no reason other than not being built. Restore it.
Fixes: df3ff6be2b33 ("eal: simplify meson build of common directory")
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Acked-by: William Tu <u9012063 at gmail.com>
Acked-by: Ranjit Menon <ranjit.menon at intel.com>
---
lib/librte_eal/common/meson.build | 59 ++++++++-----------------------
1 file changed, 15 insertions(+), 44 deletions(-)
diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index 39abf7a0a4..e7ea0fd388 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -5,51 +5,16 @@ includes += include_directories('.')
cflags += [ '-DABI_VERSION="@0@"'.format(abi_version) ]
-if is_windows
- sources += files(
- 'eal_common_bus.c',
- 'eal_common_class.c',
- 'eal_common_config.c',
- 'eal_common_debug.c',
- 'eal_common_dev.c',
- 'eal_common_devargs.c',
- 'eal_common_dynmem.c',
- 'eal_common_errno.c',
- 'eal_common_fbarray.c',
- 'eal_common_hexdump.c',
- 'eal_common_launch.c',
- 'eal_common_lcore.c',
- 'eal_common_log.c',
- 'eal_common_mcfg.c',
- 'eal_common_memalloc.c',
- 'eal_common_memory.c',
- 'eal_common_memzone.c',
- 'eal_common_options.c',
- 'eal_common_string_fns.c',
- 'eal_common_tailqs.c',
- 'eal_common_thread.c',
- 'eal_common_trace_points.c',
- 'malloc_elem.c',
- 'malloc_heap.c',
- 'rte_malloc.c',
- 'eal_common_timer.c',
- 'rte_service.c',
- )
- subdir_done()
-endif
-
sources += files(
'eal_common_bus.c',
- 'eal_common_cpuflags.c',
'eal_common_class.c',
'eal_common_config.c',
'eal_common_debug.c',
- 'eal_common_devargs.c',
'eal_common_dev.c',
+ 'eal_common_devargs.c',
'eal_common_errno.c',
'eal_common_fbarray.c',
'eal_common_hexdump.c',
- 'eal_common_hypervisor.c',
'eal_common_launch.c',
'eal_common_lcore.c',
'eal_common_log.c',
@@ -58,27 +23,33 @@ sources += files(
'eal_common_memory.c',
'eal_common_memzone.c',
'eal_common_options.c',
- 'eal_common_proc.c',
'eal_common_string_fns.c',
'eal_common_tailqs.c',
'eal_common_thread.c',
'eal_common_timer.c',
- 'eal_common_trace.c',
- 'eal_common_trace_ctf.c',
'eal_common_trace_points.c',
- 'eal_common_trace_utils.c',
'eal_common_uuid.c',
'hotplug_mp.c',
'malloc_elem.c',
'malloc_heap.c',
- 'malloc_mp.c',
- 'rte_keepalive.c',
'rte_malloc.c',
'rte_random.c',
'rte_reciprocal.c',
'rte_service.c',
)
-
-if is_linux
+if is_linux or is_windows
sources += files('eal_common_dynmem.c')
endif
+if not is_windows
+ sources += files(
+ 'eal_common_cpuflags.c',
+ 'eal_common_hypervisor.c',
+ 'eal_common_proc.c',
+ 'eal_common_trace.c',
+ 'eal_common_trace_ctf.c',
+ 'eal_common_trace_utils.c',
+ 'hotplug_mp.c',
+ 'malloc_mp.c',
+ 'rte_keepalive.c',
+ )
+endif
--
2.33.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-11-10 14:17:05.658069403 +0800
+++ 0081-eal-remove-Windows-specific-list-of-common-files.patch 2021-11-10 14:17:01.844079642 +0800
@@ -1 +1 @@
-From cf665406b1f834baf3436bb6e829b38efca55fd9 Mon Sep 17 00:00:00 2001
+From 51a9cd2327f3bc2f1d0535e140d94f2ae48ef3bd Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit cf665406b1f834baf3436bb6e829b38efca55fd9 ]
@@ -23,9 +26,8 @@
- lib/eal/common/meson.build | 63 +++++++++-----------------------------
- lib/eal/version.map | 8 ++---
- 2 files changed, 19 insertions(+), 52 deletions(-)
-
-diff --git a/lib/eal/common/meson.build b/lib/eal/common/meson.build
-index edfca77779..6d01b0f072 100644
---- a/lib/eal/common/meson.build
-+++ b/lib/eal/common/meson.build
-@@ -5,54 +5,16 @@ includes += include_directories('.')
+ lib/librte_eal/common/meson.build | 59 ++++++++-----------------------
+ 1 file changed, 15 insertions(+), 44 deletions(-)
+
+diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
+index 39abf7a0a4..e7ea0fd388 100644
+--- a/lib/librte_eal/common/meson.build
++++ b/lib/librte_eal/common/meson.build
+@@ -5,51 +5,16 @@ includes += include_directories('.')
@@ -36,33 +38,30 @@
-- sources += files(
-- 'eal_common_bus.c',
-- 'eal_common_class.c',
-- 'eal_common_config.c',
-- 'eal_common_debug.c',
-- 'eal_common_dev.c',
-- 'eal_common_devargs.c',
-- 'eal_common_dynmem.c',
-- 'eal_common_errno.c',
-- 'eal_common_fbarray.c',
-- 'eal_common_hexdump.c',
-- 'eal_common_launch.c',
-- 'eal_common_lcore.c',
-- 'eal_common_log.c',
-- 'eal_common_mcfg.c',
-- 'eal_common_memalloc.c',
-- 'eal_common_memory.c',
-- 'eal_common_memzone.c',
-- 'eal_common_options.c',
-- 'eal_common_string_fns.c',
-- 'eal_common_tailqs.c',
-- 'eal_common_thread.c',
-- 'eal_common_trace_points.c',
-- 'malloc_elem.c',
-- 'malloc_heap.c',
-- 'rte_malloc.c',
-- 'eal_common_timer.c',
-- 'rte_random.c',
-- 'rte_reciprocal.c',
-- 'rte_service.c',
-- 'rte_version.c',
-- )
-- subdir_done()
+- sources += files(
+- 'eal_common_bus.c',
+- 'eal_common_class.c',
+- 'eal_common_config.c',
+- 'eal_common_debug.c',
+- 'eal_common_dev.c',
+- 'eal_common_devargs.c',
+- 'eal_common_dynmem.c',
+- 'eal_common_errno.c',
+- 'eal_common_fbarray.c',
+- 'eal_common_hexdump.c',
+- 'eal_common_launch.c',
+- 'eal_common_lcore.c',
+- 'eal_common_log.c',
+- 'eal_common_mcfg.c',
+- 'eal_common_memalloc.c',
+- 'eal_common_memory.c',
+- 'eal_common_memzone.c',
+- 'eal_common_options.c',
+- 'eal_common_string_fns.c',
+- 'eal_common_tailqs.c',
+- 'eal_common_thread.c',
+- 'eal_common_trace_points.c',
+- 'malloc_elem.c',
+- 'malloc_heap.c',
+- 'rte_malloc.c',
+- 'eal_common_timer.c',
+- 'rte_service.c',
+- )
+- subdir_done()
@@ -72,39 +71,38 @@
- 'eal_common_bus.c',
-- 'eal_common_cpuflags.c',
- 'eal_common_class.c',
- 'eal_common_config.c',
- 'eal_common_debug.c',
-- 'eal_common_devargs.c',
- 'eal_common_dev.c',
-+ 'eal_common_devargs.c',
- 'eal_common_errno.c',
- 'eal_common_fbarray.c',
- 'eal_common_hexdump.c',
-- 'eal_common_hypervisor.c',
- 'eal_common_launch.c',
- 'eal_common_lcore.c',
- 'eal_common_log.c',
-@@ -61,28 +23,33 @@ sources += files(
- 'eal_common_memory.c',
- 'eal_common_memzone.c',
- 'eal_common_options.c',
-- 'eal_common_proc.c',
- 'eal_common_string_fns.c',
- 'eal_common_tailqs.c',
- 'eal_common_thread.c',
- 'eal_common_timer.c',
-- 'eal_common_trace.c',
-- 'eal_common_trace_ctf.c',
- 'eal_common_trace_points.c',
-- 'eal_common_trace_utils.c',
- 'eal_common_uuid.c',
-- 'hotplug_mp.c',
- 'malloc_elem.c',
- 'malloc_heap.c',
-- 'malloc_mp.c',
-- 'rte_keepalive.c',
- 'rte_malloc.c',
- 'rte_random.c',
- 'rte_reciprocal.c',
- 'rte_service.c',
- 'rte_version.c',
+ 'eal_common_bus.c',
+- 'eal_common_cpuflags.c',
+ 'eal_common_class.c',
+ 'eal_common_config.c',
+ 'eal_common_debug.c',
+- 'eal_common_devargs.c',
+ 'eal_common_dev.c',
++ 'eal_common_devargs.c',
+ 'eal_common_errno.c',
+ 'eal_common_fbarray.c',
+ 'eal_common_hexdump.c',
+- 'eal_common_hypervisor.c',
+ 'eal_common_launch.c',
+ 'eal_common_lcore.c',
+ 'eal_common_log.c',
+@@ -58,27 +23,33 @@ sources += files(
+ 'eal_common_memory.c',
+ 'eal_common_memzone.c',
+ 'eal_common_options.c',
+- 'eal_common_proc.c',
+ 'eal_common_string_fns.c',
+ 'eal_common_tailqs.c',
+ 'eal_common_thread.c',
+ 'eal_common_timer.c',
+- 'eal_common_trace.c',
+- 'eal_common_trace_ctf.c',
+ 'eal_common_trace_points.c',
+- 'eal_common_trace_utils.c',
+ 'eal_common_uuid.c',
+ 'hotplug_mp.c',
+ 'malloc_elem.c',
+ 'malloc_heap.c',
+- 'malloc_mp.c',
+- 'rte_keepalive.c',
+ 'rte_malloc.c',
+ 'rte_random.c',
+ 'rte_reciprocal.c',
+ 'rte_service.c',
@@ -115 +113 @@
- sources += files('eal_common_dynmem.c')
+ sources += files('eal_common_dynmem.c')
@@ -118,11 +116,11 @@
-+ sources += files(
-+ 'eal_common_cpuflags.c',
-+ 'eal_common_hypervisor.c',
-+ 'eal_common_proc.c',
-+ 'eal_common_trace.c',
-+ 'eal_common_trace_ctf.c',
-+ 'eal_common_trace_utils.c',
-+ 'hotplug_mp.c',
-+ 'malloc_mp.c',
-+ 'rte_keepalive.c',
-+ )
++ sources += files(
++ 'eal_common_cpuflags.c',
++ 'eal_common_hypervisor.c',
++ 'eal_common_proc.c',
++ 'eal_common_trace.c',
++ 'eal_common_trace_ctf.c',
++ 'eal_common_trace_utils.c',
++ 'hotplug_mp.c',
++ 'malloc_mp.c',
++ 'rte_keepalive.c',
++ )
@@ -130,19 +127,0 @@
-diff --git a/lib/eal/version.map b/lib/eal/version.map
-index d800090db0..1d916cd74e 100644
---- a/lib/eal/version.map
-+++ b/lib/eal/version.map
-@@ -263,10 +263,10 @@ DPDK_22 {
- rte_thread_get_affinity;
- rte_thread_set_affinity;
- rte_thread_setname;
-- rte_uuid_compare; # WINDOWS_NO_EXPORT
-- rte_uuid_is_null; # WINDOWS_NO_EXPORT
-- rte_uuid_parse; # WINDOWS_NO_EXPORT
-- rte_uuid_unparse; # WINDOWS_NO_EXPORT
-+ rte_uuid_compare;
-+ rte_uuid_is_null;
-+ rte_uuid_parse;
-+ rte_uuid_unparse;
- rte_version;
- rte_vfio_clear_group; # WINDOWS_NO_EXPORT
- rte_vfio_container_create; # WINDOWS_NO_EXPORT
More information about the stable
mailing list