[dpdk-stable] patch 'ethdev: fix log type for some error messages' has been queued to stable release 19.11.4

luca.boccassi at gmail.com luca.boccassi at gmail.com
Fri Jul 24 13:59:21 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 07/26/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 9e38ba9f27d48c08b4f6276f1dcbad70ac67230c Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Thu, 2 Jul 2020 12:17:05 +0100
Subject: [PATCH] ethdev: fix log type for some error messages

[ upstream commit f6ac2b06ecffa62abbc2cd6009b593604c2f3447 ]

Some log macros was using 'EAL' logtype, convert them to 'ethdev'.
Also fix missing EOL and fix syntax for some logs.

Fixes: 214ed1acd125 ("ethdev: add iterator to match devargs input")
Fixes: e489007a411c ("ethdev: add generic create/destroy ethdev APIs")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Reviewed-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 lib/librte_ethdev/rte_ethdev.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index c3657509c..d245cfcea 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -279,7 +279,7 @@ end:
 
 error:
 	if (ret == -ENOTSUP)
-		RTE_LOG(ERR, EAL, "Bus %s does not support iterating.\n",
+		RTE_ETHDEV_LOG(ERR, "Bus %s does not support iterating.\n",
 				iter->bus->name);
 	free(devargs.args);
 	free(bus_str);
@@ -4221,7 +4221,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
 				device->numa_node);
 
 			if (!ethdev->data->dev_private) {
-				RTE_LOG(ERR, EAL, "failed to allocate private data");
+				RTE_ETHDEV_LOG(ERR,
+					"failed to allocate private data\n");
 				retval = -ENOMEM;
 				goto probe_failed;
 			}
@@ -4229,8 +4230,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
 	} else {
 		ethdev = rte_eth_dev_attach_secondary(name);
 		if (!ethdev) {
-			RTE_LOG(ERR, EAL, "secondary process attach failed, "
-				"ethdev doesn't exist");
+			RTE_ETHDEV_LOG(ERR,
+				"secondary process attach failed, ethdev doesn't exist\n");
 			return  -ENODEV;
 		}
 	}
@@ -4240,15 +4241,15 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
 	if (ethdev_bus_specific_init) {
 		retval = ethdev_bus_specific_init(ethdev, bus_init_params);
 		if (retval) {
-			RTE_LOG(ERR, EAL,
-				"ethdev bus specific initialisation failed");
+			RTE_ETHDEV_LOG(ERR,
+				"ethdev bus specific initialisation failed\n");
 			goto probe_failed;
 		}
 	}
 
 	retval = ethdev_init(ethdev, init_params);
 	if (retval) {
-		RTE_LOG(ERR, EAL, "ethdev initialisation failed");
+		RTE_ETHDEV_LOG(ERR, "ethdev initialisation failed\n");
 		goto probe_failed;
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:53.285679999 +0100
+++ 0123-ethdev-fix-log-type-for-some-error-messages.patch	2020-07-24 12:53:48.419008919 +0100
@@ -1,14 +1,15 @@
-From f6ac2b06ecffa62abbc2cd6009b593604c2f3447 Mon Sep 17 00:00:00 2001
+From 9e38ba9f27d48c08b4f6276f1dcbad70ac67230c Mon Sep 17 00:00:00 2001
 From: Ferruh Yigit <ferruh.yigit at intel.com>
 Date: Thu, 2 Jul 2020 12:17:05 +0100
 Subject: [PATCH] ethdev: fix log type for some error messages
 
+[ upstream commit f6ac2b06ecffa62abbc2cd6009b593604c2f3447 ]
+
 Some log macros was using 'EAL' logtype, convert them to 'ethdev'.
 Also fix missing EOL and fix syntax for some logs.
 
 Fixes: 214ed1acd125 ("ethdev: add iterator to match devargs input")
 Fixes: e489007a411c ("ethdev: add generic create/destroy ethdev APIs")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
 Reviewed-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -17,10 +18,10 @@
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
-index d06b7f9b1..5f10f2d8d 100644
+index c3657509c..d245cfcea 100644
 --- a/lib/librte_ethdev/rte_ethdev.c
 +++ b/lib/librte_ethdev/rte_ethdev.c
-@@ -277,7 +277,7 @@ end:
+@@ -279,7 +279,7 @@ end:
  
  error:
  	if (ret == -ENOTSUP)
@@ -29,7 +30,7 @@
  				iter->bus->name);
  	free(devargs.args);
  	free(bus_str);
-@@ -4230,7 +4230,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
+@@ -4221,7 +4221,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
  				device->numa_node);
  
  			if (!ethdev->data->dev_private) {
@@ -39,7 +40,7 @@
  				retval = -ENOMEM;
  				goto probe_failed;
  			}
-@@ -4238,8 +4239,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
+@@ -4229,8 +4230,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
  	} else {
  		ethdev = rte_eth_dev_attach_secondary(name);
  		if (!ethdev) {
@@ -50,7 +51,7 @@
  			return  -ENODEV;
  		}
  	}
-@@ -4249,15 +4250,15 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
+@@ -4240,15 +4241,15 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
  	if (ethdev_bus_specific_init) {
  		retval = ethdev_bus_specific_init(ethdev, bus_init_params);
  		if (retval) {


More information about the stable mailing list