patch 'telemetry: add missing C++ guards' has been queued to stable release 19.11.12

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Wed Mar 9 12:00:33 CET 2022


Hi,

FYI, your patch has been queued to stable release 19.11.12

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

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From c7b95a425e597c13503f007c1285138429462841 Mon Sep 17 00:00:00 2001
From: Brian Dooley <brian.dooley at intel.com>
Date: Wed, 16 Feb 2022 15:14:47 +0000
Subject: [PATCH] telemetry: add missing C++ guards

[ upstream commit cf8e6263647d217ad5c9bdfa2c3275f71bd19f64 ]

Some public header files were missing 'extern "C"' C++ guards,
and couldn't be used by C++ applications. Add the missing guards.

Fixes: 8877ac688b52 ("telemetry: introduce infrastructure")

Signed-off-by: Brian Dooley <brian.dooley at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
 lib/librte_telemetry/rte_telemetry.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h
index f1376ea35f..a5ff0e75f3 100644
--- a/lib/librte_telemetry/rte_telemetry.h
+++ b/lib/librte_telemetry/rte_telemetry.h
@@ -7,6 +7,10 @@
 #ifndef _RTE_TELEMETRY_H_
 #define _RTE_TELEMETRY_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @file
  *
@@ -71,4 +75,8 @@ __rte_experimental
 int32_t
 rte_telemetry_selftest(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-09 11:57:43.522656279 +0100
+++ 0002-telemetry-add-missing-C-guards.patch	2022-03-09 11:57:43.312937879 +0100
@@ -1 +1 @@
-From cf8e6263647d217ad5c9bdfa2c3275f71bd19f64 Mon Sep 17 00:00:00 2001
+From c7b95a425e597c13503f007c1285138429462841 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cf8e6263647d217ad5c9bdfa2c3275f71bd19f64 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
- lib/telemetry/rte_telemetry.h | 8 ++++++++
+ lib/librte_telemetry/rte_telemetry.h | 8 ++++++++
@@ -19,5 +20,5 @@
-diff --git a/lib/telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h
-index 7bca8a9a49..3372b32f38 100644
---- a/lib/telemetry/rte_telemetry.h
-+++ b/lib/telemetry/rte_telemetry.h
-@@ -9,6 +9,10 @@
+diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h
+index f1376ea35f..a5ff0e75f3 100644
+--- a/lib/librte_telemetry/rte_telemetry.h
++++ b/lib/librte_telemetry/rte_telemetry.h
+@@ -7,6 +7,10 @@
@@ -31,6 +32,6 @@
- /** Maximum length for string used in object. */
- #define RTE_TEL_MAX_STRING_LEN 128
- /** Maximum length of string. */
-@@ -294,4 +298,8 @@ rte_tel_data_alloc(void);
- void
- rte_tel_data_free(struct rte_tel_data *data);
+ /**
+  * @file
+  *
+@@ -71,4 +75,8 @@ __rte_experimental
+ int32_t
+ rte_telemetry_selftest(void);


More information about the stable mailing list