[dpdk-stable] patch 'eal: declare trace buffer at top of own block' has been queued to LTS release 17.11.5

Yongseok Koh yskoh at mellanox.com
Thu Jan 3 09:13:26 CET 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/04/19. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 7d236f3f9363bbf691c8ed7b534173d152d3fcaa Mon Sep 17 00:00:00 2001
From: Andy Green <andy at warmcat.com>
Date: Sat, 12 May 2018 09:59:32 +0800
Subject: [PATCH] eal: declare trace buffer at top of own block

[ upstream commit e3908132b7903dbbf45c6d073792cccc890812e0 ]

rte_dev.h:54:2:
warning: ISO C90 forbids mixed declarations and
code [-Wdeclaration-after-statement]
  char buffer[vsnprintf(NULL, 0, fmt, ap) + 1];

Fixes: b974e4a40cb5 ("ethdev: make error checking macros public")

Signed-off-by: Andy Green <andy at warmcat.com>
Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
---
 lib/librte_eal/common/include/rte_dev.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h
index 8088dcc53..bc6e5926f 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -60,15 +60,18 @@ rte_pmd_debug_trace(const char *func_name, const char *fmt, ...)
 
 	va_start(ap, fmt);
 
-	char buffer[vsnprintf(NULL, 0, fmt, ap) + 1];
+	{
+		char buffer[vsnprintf(NULL, 0, fmt, ap) + 1];
 
-	va_end(ap);
+		va_end(ap);
 
-	va_start(ap, fmt);
-	vsnprintf(buffer, sizeof(buffer), fmt, ap);
-	va_end(ap);
+		va_start(ap, fmt);
+		vsnprintf(buffer, sizeof(buffer), fmt, ap);
+		va_end(ap);
 
-	rte_log(RTE_LOG_ERR, RTE_LOGTYPE_PMD, "%s: %s", func_name, buffer);
+		rte_log(RTE_LOG_ERR, RTE_LOGTYPE_PMD, "%s: %s",
+			func_name, buffer);
+	}
 }
 
 /*
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-02 23:59:12.265616323 -0800
+++ 0003-eal-declare-trace-buffer-at-top-of-own-block.patch	2019-01-02 23:59:12.004814000 -0800
@@ -1,15 +1,16 @@
-From e3908132b7903dbbf45c6d073792cccc890812e0 Mon Sep 17 00:00:00 2001
+From 7d236f3f9363bbf691c8ed7b534173d152d3fcaa Mon Sep 17 00:00:00 2001
 From: Andy Green <andy at warmcat.com>
 Date: Sat, 12 May 2018 09:59:32 +0800
 Subject: [PATCH] eal: declare trace buffer at top of own block
 
+[ upstream commit e3908132b7903dbbf45c6d073792cccc890812e0 ]
+
 rte_dev.h:54:2:
 warning: ISO C90 forbids mixed declarations and
 code [-Wdeclaration-after-statement]
   char buffer[vsnprintf(NULL, 0, fmt, ap) + 1];
 
 Fixes: b974e4a40cb5 ("ethdev: make error checking macros public")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andy Green <andy at warmcat.com>
 Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
@@ -18,10 +19,10 @@
  1 file changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h
-index 0955e9adb..3879ff3ca 100644
+index 8088dcc53..bc6e5926f 100644
 --- a/lib/librte_eal/common/include/rte_dev.h
 +++ b/lib/librte_eal/common/include/rte_dev.h
-@@ -51,15 +51,18 @@ rte_pmd_debug_trace(const char *func_name, const char *fmt, ...)
+@@ -60,15 +60,18 @@ rte_pmd_debug_trace(const char *func_name, const char *fmt, ...)
  
  	va_start(ap, fmt);
  


More information about the stable mailing list