[dpdk-stable] patch 'examples/packet_ordering: use proper exit method' has been queued to stable release 19.11.4

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Aug 6 11:54:04 CEST 2020


Hi,

FYI, your patch has been queued to stable release 19.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 08/08/20. 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.

Thanks.

Luca Boccassi

---
>From 4ad16494bbb89beeac58ab1a02923e3e7bb87e8e Mon Sep 17 00:00:00 2001
From: Sarosh Arif <sarosh.arif at emumba.com>
Date: Fri, 5 Jun 2020 16:48:28 +0500
Subject: [PATCH] examples/packet_ordering: use proper exit method

[ upstream commit d74fab8e7cc36acaf2abf83888809fd1e40c932a ]

rte_exit should be called when the application exits due to
invalid EAL or application arguments.

Fixes: 850f3733f840 ("examples/packet_ordering: new sample app")

Signed-off-by: Sarosh Arif <sarosh.arif at emumba.com>
---
 examples/packet_ordering/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/packet_ordering/main.c b/examples/packet_ordering/main.c
index b397b318e..edaf810d9 100644
--- a/examples/packet_ordering/main.c
+++ b/examples/packet_ordering/main.c
@@ -675,7 +675,7 @@ main(int argc, char **argv)
 	/* Initialize EAL */
 	ret = rte_eal_init(argc, argv);
 	if (ret < 0)
-		return -1;
+		rte_exit(EXIT_FAILURE, "Invalid EAL arguments\n");
 
 	argc -= ret;
 	argv += ret;
@@ -683,7 +683,7 @@ main(int argc, char **argv)
 	/* Parse the application specific arguments */
 	ret = parse_args(argc, argv);
 	if (ret < 0)
-		return -1;
+		rte_exit(EXIT_FAILURE, "Invalid packet_ordering arguments\n");
 
 	/* Check if we have enought cores */
 	if (rte_lcore_count() < 3)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:17.190200716 +0100
+++ 0036-examples-packet_ordering-use-proper-exit-method.patch	2020-08-06 10:53:15.828597956 +0100
@@ -1,8 +1,10 @@
-From d74fab8e7cc36acaf2abf83888809fd1e40c932a Mon Sep 17 00:00:00 2001
+From 4ad16494bbb89beeac58ab1a02923e3e7bb87e8e Mon Sep 17 00:00:00 2001
 From: Sarosh Arif <sarosh.arif at emumba.com>
 Date: Fri, 5 Jun 2020 16:48:28 +0500
 Subject: [PATCH] examples/packet_ordering: use proper exit method
 
+[ upstream commit d74fab8e7cc36acaf2abf83888809fd1e40c932a ]
+
 rte_exit should be called when the application exits due to
 invalid EAL or application arguments.
 
@@ -14,10 +16,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/examples/packet_ordering/main.c b/examples/packet_ordering/main.c
-index 5c654c11c..b5fc6c54b 100644
+index b397b318e..edaf810d9 100644
 --- a/examples/packet_ordering/main.c
 +++ b/examples/packet_ordering/main.c
-@@ -672,7 +672,7 @@ main(int argc, char **argv)
+@@ -675,7 +675,7 @@ main(int argc, char **argv)
  	/* Initialize EAL */
  	ret = rte_eal_init(argc, argv);
  	if (ret < 0)
@@ -26,7 +28,7 @@
  
  	argc -= ret;
  	argv += ret;
-@@ -680,7 +680,7 @@ main(int argc, char **argv)
+@@ -683,7 +683,7 @@ main(int argc, char **argv)
  	/* Parse the application specific arguments */
  	ret = parse_args(argc, argv);
  	if (ret < 0)


More information about the stable mailing list