[dpdk-stable] patch 'log: fix level picked with globbing on type register' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
>From df1c0724ff3d2e6d65fe93df5e80db73882557e8 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Wed, 8 Apr 2020 00:47:58 +0200
Subject: [PATCH] log: fix level picked with globbing on type register

[ upstream commit b2a6d7e0484b8460374b2f058ac78bd4536b3e83 ]

When a log type is registered, the level can be picked
by matching saved options.
The check of fnmatch globbing result was reversed.

The same bug was already fixed in a similar function.
This one is acting in log type register function.

Note: this function rte_log_register_type_and_pick_level()
is not used a lot and could be merged with rte_log_register().

Fixes: 6ff0f81d0ef7 ("log: fix pattern matching")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
---
 lib/librte_eal/common/eal_common_log.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c
index 2c1200310d..9453fa3e9a 100644
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -285,5 +285,5 @@ rte_log_register_type_and_pick_level(const char *name, uint32_t level_def)
 
 		if (opt_ll->pattern) {
-			if (fnmatch(opt_ll->pattern, name, 0))
+			if (fnmatch(opt_ll->pattern, name, 0) == 0)
 				level = opt_ll->level;
 		} else {
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:00.815670365 +0100
+++ 0032-log-fix-level-picked-with-globbing-on-type-register.patch	2020-05-28 17:12:59.092556604 +0100
@@ -1 +1 @@
-From b2a6d7e0484b8460374b2f058ac78bd4536b3e83 Mon Sep 17 00:00:00 2001
+From df1c0724ff3d2e6d65fe93df5e80db73882557e8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b2a6d7e0484b8460374b2f058ac78bd4536b3e83 ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 7647a916ef..d7a5f9b641 100644
+index 2c1200310d..9453fa3e9a 100644
@@ -28 +29 @@
-@@ -321,5 +321,5 @@ rte_log_register_type_and_pick_level(const char *name, uint32_t level_def)
+@@ -285,5 +285,5 @@ rte_log_register_type_and_pick_level(const char *name, uint32_t level_def)