patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH 19.11] eal/windows: add cleanup function stub
@ 2021-06-13 21:36 Dmitry Kozlyuk
  2021-06-14  5:23 ` Christian Ehrhardt
  0 siblings, 1 reply; 2+ messages in thread
From: Dmitry Kozlyuk @ 2021-06-13 21:36 UTC (permalink / raw)
  To: stable; +Cc: Tal Shnaiderman, Dmitry Kozlyuk, Yu Jiang

Upstream commit 10aa375704c1 ("examples: add eal cleanup to examples")
requires librte_eal to export rte_eal_clearnup(). On Windows, it was
exported by commit c91717eb75c8 ("eal/windows: support exit and panic"),
which is based on refactoring that is not backported.

Add a stub to fix the build.
In 19.11 LTS this function has nothing to clean up.

Bugzilla ID: 732

Reported-by: Yu Jiang <yux.jiang@intel.com>
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
 lib/librte_eal/rte_eal_exports.def | 1 +
 lib/librte_eal/windows/eal/eal.c   | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/lib/librte_eal/rte_eal_exports.def b/lib/librte_eal/rte_eal_exports.def
index c1bdee1c40..61b4082a54 100644
--- a/lib/librte_eal/rte_eal_exports.def
+++ b/lib/librte_eal/rte_eal_exports.def
@@ -1,5 +1,6 @@
 EXPORTS
 	__rte_panic
+	rte_eal_cleanup
 	rte_eal_init
 	rte_eal_mp_remote_launch
 	rte_eal_mp_wait_lcore
diff --git a/lib/librte_eal/windows/eal/eal.c b/lib/librte_eal/windows/eal/eal.c
index ce460481f8..7cfa8451a3 100644
--- a/lib/librte_eal/windows/eal/eal.c
+++ b/lib/librte_eal/windows/eal/eal.c
@@ -82,3 +82,9 @@ rte_eal_init(int argc __rte_unused, char **argv __rte_unused)
 	rte_eal_mp_wait_lcore();
 	return 0;
 }
+
+int
+rte_eal_cleanup(void)
+{
+	return 0;
+}
-- 
2.29.3


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [dpdk-stable] [PATCH 19.11] eal/windows: add cleanup function stub
  2021-06-13 21:36 [dpdk-stable] [PATCH 19.11] eal/windows: add cleanup function stub Dmitry Kozlyuk
@ 2021-06-14  5:23 ` Christian Ehrhardt
  0 siblings, 0 replies; 2+ messages in thread
From: Christian Ehrhardt @ 2021-06-14  5:23 UTC (permalink / raw)
  To: Dmitry Kozlyuk; +Cc: stable, Tal Shnaiderman, Yu Jiang

On Sun, Jun 13, 2021 at 11:36 PM Dmitry Kozlyuk
<dmitry.kozliuk@gmail.com> wrote:
>
> Upstream commit 10aa375704c1 ("examples: add eal cleanup to examples")
> requires librte_eal to export rte_eal_clearnup(). On Windows, it was
> exported by commit c91717eb75c8 ("eal/windows: support exit and panic"),
> which is based on refactoring that is not backported.
>
> Add a stub to fix the build.
> In 19.11 LTS this function has nothing to clean up.

Thank you, applied to 19.11.x (will be in the coming 19.11.9-rc3)

> Bugzilla ID: 732
>
> Reported-by: Yu Jiang <yux.jiang@intel.com>
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> ---
>  lib/librte_eal/rte_eal_exports.def | 1 +
>  lib/librte_eal/windows/eal/eal.c   | 6 ++++++
>  2 files changed, 7 insertions(+)
>
> diff --git a/lib/librte_eal/rte_eal_exports.def b/lib/librte_eal/rte_eal_exports.def
> index c1bdee1c40..61b4082a54 100644
> --- a/lib/librte_eal/rte_eal_exports.def
> +++ b/lib/librte_eal/rte_eal_exports.def
> @@ -1,5 +1,6 @@
>  EXPORTS
>         __rte_panic
> +       rte_eal_cleanup
>         rte_eal_init
>         rte_eal_mp_remote_launch
>         rte_eal_mp_wait_lcore
> diff --git a/lib/librte_eal/windows/eal/eal.c b/lib/librte_eal/windows/eal/eal.c
> index ce460481f8..7cfa8451a3 100644
> --- a/lib/librte_eal/windows/eal/eal.c
> +++ b/lib/librte_eal/windows/eal/eal.c
> @@ -82,3 +82,9 @@ rte_eal_init(int argc __rte_unused, char **argv __rte_unused)
>         rte_eal_mp_wait_lcore();
>         return 0;
>  }
> +
> +int
> +rte_eal_cleanup(void)
> +{
> +       return 0;
> +}
> --
> 2.29.3
>


-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-06-14  5:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-13 21:36 [dpdk-stable] [PATCH 19.11] eal/windows: add cleanup function stub Dmitry Kozlyuk
2021-06-14  5:23 ` Christian Ehrhardt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).