patch 'eal: fix logs for '--lcores'' has been queued to stable release 21.11.8

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.8

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/28/24. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/1f57a72efce3d886b70a9356b7ef6ccd6d603778

Thanks.

Kevin

---
>From 1f57a72efce3d886b70a9356b7ef6ccd6d603778 Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor at redhat.com>
Date: Thu, 13 Jun 2024 17:14:29 +0100
Subject: [PATCH] eal: fix logs for '--lcores'

[ upstream commit 0f241cc22e30de0dfd7487dcfd6acde220b5e168 ]

The argument is '--lcores' but it is being logged as '--lcore'
in several places.

e.g.
$ dpdk-testpmd -l 8,10,12 --lcores 8,10,12
EAL: Option --lcore is ignored, because (-l) is set!

Fix the spelling in logs and tests.

Fixes: 117eaa70584b ("eal: add error check for core options")
Fixes: 128ee4c26d87 ("app/test: add unit tests for --lcores option")

Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 app/test/test_eal_flags.c           | 2 +-
 lib/eal/common/eal_common_options.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index d7f4c2cd47..8916ea5882 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -584,5 +584,5 @@ test_missing_c_flag(void)
 	    launch_proc(argv28) == 0 || launch_proc(argv30) == 0) {
 		printf("Error - "
-		       "process ran without error with invalid --lcore flag\n");
+		       "process ran without error with invalid --lcores flag\n");
 		return -1;
 	}
diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c
index 1cd7a33fbf..954062a386 100644
--- a/lib/eal/common/eal_common_options.c
+++ b/lib/eal/common/eal_common_options.c
@@ -1664,5 +1664,5 @@ eal_parse_common_option(int opt, const char *optarg,
 			RTE_LOG(ERR, EAL, "Option -c is ignored, because (%s) is set!\n",
 				(core_parsed == LCORE_OPT_LST) ? "-l" :
-				(core_parsed == LCORE_OPT_MAP) ? "--lcore" :
+				(core_parsed == LCORE_OPT_MAP) ? "--lcores" :
 				"-c");
 			return -1;
@@ -1697,5 +1697,5 @@ eal_parse_common_option(int opt, const char *optarg,
 			RTE_LOG(ERR, EAL, "Option -l is ignored, because (%s) is set!\n",
 				(core_parsed == LCORE_OPT_MSK) ? "-c" :
-				(core_parsed == LCORE_OPT_MAP) ? "--lcore" :
+				(core_parsed == LCORE_OPT_MAP) ? "--lcores" :
 				"-l");
 			return -1;
@@ -1875,8 +1875,8 @@ eal_parse_common_option(int opt, const char *optarg,
 
 		if (core_parsed) {
-			RTE_LOG(ERR, EAL, "Option --lcore is ignored, because (%s) is set!\n",
+			RTE_LOG(ERR, EAL, "Option --lcores is ignored, because (%s) is set!\n",
 				(core_parsed == LCORE_OPT_LST) ? "-l" :
 				(core_parsed == LCORE_OPT_MSK) ? "-c" :
-				"--lcore");
+				"--lcores");
 			return -1;
 		}
-- 
2.46.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-23 17:18:11.077655231 +0100
+++ 0038-eal-fix-logs-for-lcores.patch	2024-08-23 17:18:09.679429962 +0100
@@ -1 +1 @@
-From 0f241cc22e30de0dfd7487dcfd6acde220b5e168 Mon Sep 17 00:00:00 2001
+From 1f57a72efce3d886b70a9356b7ef6ccd6d603778 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0f241cc22e30de0dfd7487dcfd6acde220b5e168 ]
+
@@ -26 +28 @@
-index 6cb4b06757..71d8dba731 100644
+index d7f4c2cd47..8916ea5882 100644
@@ -29 +31 @@
-@@ -672,5 +672,5 @@ test_missing_c_flag(void)
+@@ -584,5 +584,5 @@ test_missing_c_flag(void)
@@ -37 +39 @@
-index e541f07939..f1a5e329a5 100644
+index 1cd7a33fbf..954062a386 100644
@@ -40,2 +42,2 @@
-@@ -1688,5 +1688,5 @@ eal_parse_common_option(int opt, const char *optarg,
- 			EAL_LOG(ERR, "Option -c is ignored, because (%s) is set!",
+@@ -1664,5 +1664,5 @@ eal_parse_common_option(int opt, const char *optarg,
+ 			RTE_LOG(ERR, EAL, "Option -c is ignored, because (%s) is set!\n",
@@ -47,2 +49,2 @@
-@@ -1721,5 +1721,5 @@ eal_parse_common_option(int opt, const char *optarg,
- 			EAL_LOG(ERR, "Option -l is ignored, because (%s) is set!",
+@@ -1697,5 +1697,5 @@ eal_parse_common_option(int opt, const char *optarg,
+ 			RTE_LOG(ERR, EAL, "Option -l is ignored, because (%s) is set!\n",
@@ -54 +56 @@
-@@ -1902,8 +1902,8 @@ eal_parse_common_option(int opt, const char *optarg,
+@@ -1875,8 +1875,8 @@ eal_parse_common_option(int opt, const char *optarg,
@@ -57,2 +59,2 @@
--			EAL_LOG(ERR, "Option --lcore is ignored, because (%s) is set!",
-+			EAL_LOG(ERR, "Option --lcores is ignored, because (%s) is set!",
+-			RTE_LOG(ERR, EAL, "Option --lcore is ignored, because (%s) is set!\n",
++			RTE_LOG(ERR, EAL, "Option --lcores is ignored, because (%s) is set!\n",