patch 'ethdev: add missing C++ guards' has been queued to stable release 20.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.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 03/02/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/c840104e2394624680b36d9498367f2138ca1828

Thanks.

Luca Boccassi

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

[ upstream commit dbf9fc1dac70b64dd1ed9a3ffd6997838fbf170e ]

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

Fixes: 7a3f27cbf59b ("ethdev: add access to specific device info")
Fixes: dcd5c8112bc3 ("ethdev: add PCI driver helpers")
Fixes: 7f0a669e7b04 ("ethdev: add allocation helper for virtual drivers")
Fixes: 7a3357205755 ("lib: remove C++ include guard from private headers")

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_ethdev/rte_dev_info.h      | 8 ++++++++
 lib/librte_ethdev/rte_ethdev_driver.h | 4 ++++
 lib/librte_ethdev/rte_ethdev_pci.h    | 8 ++++++++
 lib/librte_ethdev/rte_ethdev_vdev.h   | 8 ++++++++
 4 files changed, 28 insertions(+)

diff --git a/lib/librte_ethdev/rte_dev_info.h b/lib/librte_ethdev/rte_dev_info.h
index 7a6b61fdb7..cacb989ced 100644
--- a/lib/librte_ethdev/rte_dev_info.h
+++ b/lib/librte_ethdev/rte_dev_info.h
@@ -5,6 +5,10 @@
 #ifndef _RTE_DEV_INFO_H_
 #define _RTE_DEV_INFO_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 
 /*
@@ -48,4 +52,8 @@ struct rte_eth_dev_module_info {
 #define RTE_ETH_MODULE_SFF_8436_LEN         256
 #define RTE_ETH_MODULE_SFF_8436_MAX_LEN     640
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_DEV_INFO_H_ */
diff --git a/lib/librte_ethdev/rte_ethdev_driver.h b/lib/librte_ethdev/rte_ethdev_driver.h
index b6abef7782..afee4b8b80 100644
--- a/lib/librte_ethdev/rte_ethdev_driver.h
+++ b/lib/librte_ethdev/rte_ethdev_driver.h
@@ -5,6 +5,10 @@
 #ifndef _RTE_ETHDEV_DRIVER_H_
 #define _RTE_ETHDEV_DRIVER_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @file
  *
diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h
index 0eba781917..e2c83fd941 100644
--- a/lib/librte_ethdev/rte_ethdev_pci.h
+++ b/lib/librte_ethdev/rte_ethdev_pci.h
@@ -6,6 +6,10 @@
 #ifndef _RTE_ETHDEV_PCI_H_
 #define _RTE_ETHDEV_PCI_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <rte_malloc.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
@@ -171,4 +175,8 @@ rte_eth_dev_pci_generic_remove(struct rte_pci_device *pci_dev,
 	return 0;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_ETHDEV_PCI_H_ */
diff --git a/lib/librte_ethdev/rte_ethdev_vdev.h b/lib/librte_ethdev/rte_ethdev_vdev.h
index 4ba3f28964..96a710d96a 100644
--- a/lib/librte_ethdev/rte_ethdev_vdev.h
+++ b/lib/librte_ethdev/rte_ethdev_vdev.h
@@ -6,6 +6,10 @@
 #ifndef _RTE_ETHDEV_VDEV_H_
 #define _RTE_ETHDEV_VDEV_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <rte_config.h>
 #include <rte_malloc.h>
 #include <rte_bus_vdev.h>
@@ -52,4 +56,8 @@ rte_eth_vdev_allocate(struct rte_vdev_device *dev, size_t private_data_size)
 	return eth_dev;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_ETHDEV_VDEV_H_ */
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-28 21:17:54.334585949 +0000
+++ 0004-ethdev-add-missing-C-guards.patch	2022-02-28 21:17:53.796928266 +0000
@@ -1 +1 @@
-From dbf9fc1dac70b64dd1ed9a3ffd6997838fbf170e Mon Sep 17 00:00:00 2001
+From c840104e2394624680b36d9498367f2138ca1828 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dbf9fc1dac70b64dd1ed9a3ffd6997838fbf170e ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -19,5 +20,5 @@
- lib/ethdev/ethdev_driver.h | 8 ++++++++
- lib/ethdev/ethdev_pci.h    | 8 ++++++++
- lib/ethdev/ethdev_vdev.h   | 8 ++++++++
- lib/ethdev/rte_dev_info.h  | 8 ++++++++
- 4 files changed, 32 insertions(+)
+ lib/librte_ethdev/rte_dev_info.h      | 8 ++++++++
+ lib/librte_ethdev/rte_ethdev_driver.h | 4 ++++
+ lib/librte_ethdev/rte_ethdev_pci.h    | 8 ++++++++
+ lib/librte_ethdev/rte_ethdev_vdev.h   | 8 ++++++++
+ 4 files changed, 28 insertions(+)
@@ -25,4 +26,4 @@
-diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
-index 6d697a879a..5ec00e533e 100644
---- a/lib/ethdev/ethdev_driver.h
-+++ b/lib/ethdev/ethdev_driver.h
+diff --git a/lib/librte_ethdev/rte_dev_info.h b/lib/librte_ethdev/rte_dev_info.h
+index 7a6b61fdb7..cacb989ced 100644
+--- a/lib/librte_ethdev/rte_dev_info.h
++++ b/lib/librte_ethdev/rte_dev_info.h
@@ -30,2 +31,2 @@
- #ifndef _RTE_ETHDEV_DRIVER_H_
- #define _RTE_ETHDEV_DRIVER_H_
+ #ifndef _RTE_DEV_INFO_H_
+ #define _RTE_DEV_INFO_H_
@@ -37,6 +38,6 @@
- /**
-  * @file
-  *
-@@ -1881,4 +1885,8 @@ struct rte_eth_tunnel_filter_conf {
- 	uint16_t queue_id;      /**< Queue assigned to if match */
- };
+ #include <stdint.h>
+ 
+ /*
+@@ -48,4 +52,8 @@ struct rte_eth_dev_module_info {
+ #define RTE_ETH_MODULE_SFF_8436_LEN         256
+ #define RTE_ETH_MODULE_SFF_8436_MAX_LEN     640
@@ -48,5 +49,20 @@
- #endif /* _RTE_ETHDEV_DRIVER_H_ */
-diff --git a/lib/ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h
-index 71aa4b2e98..6130bcbd1f 100644
---- a/lib/ethdev/ethdev_pci.h
-+++ b/lib/ethdev/ethdev_pci.h
+ #endif /* _RTE_DEV_INFO_H_ */
+diff --git a/lib/librte_ethdev/rte_ethdev_driver.h b/lib/librte_ethdev/rte_ethdev_driver.h
+index b6abef7782..afee4b8b80 100644
+--- a/lib/librte_ethdev/rte_ethdev_driver.h
++++ b/lib/librte_ethdev/rte_ethdev_driver.h
+@@ -5,6 +5,10 @@
+ #ifndef _RTE_ETHDEV_DRIVER_H_
+ #define _RTE_ETHDEV_DRIVER_H_
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /**
+  * @file
+  *
+diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h
+index 0eba781917..e2c83fd941 100644
+--- a/lib/librte_ethdev/rte_ethdev_pci.h
++++ b/lib/librte_ethdev/rte_ethdev_pci.h
@@ -73,4 +89,4 @@
-diff --git a/lib/ethdev/ethdev_vdev.h b/lib/ethdev/ethdev_vdev.h
-index 2b49e9665b..f5f536ce64 100644
---- a/lib/ethdev/ethdev_vdev.h
-+++ b/lib/ethdev/ethdev_vdev.h
+diff --git a/lib/librte_ethdev/rte_ethdev_vdev.h b/lib/librte_ethdev/rte_ethdev_vdev.h
+index 4ba3f28964..96a710d96a 100644
+--- a/lib/librte_ethdev/rte_ethdev_vdev.h
++++ b/lib/librte_ethdev/rte_ethdev_vdev.h
@@ -97,24 +112,0 @@
-diff --git a/lib/ethdev/rte_dev_info.h b/lib/ethdev/rte_dev_info.h
-index cb2fe0ae97..67cf0ae526 100644
---- a/lib/ethdev/rte_dev_info.h
-+++ b/lib/ethdev/rte_dev_info.h
-@@ -5,6 +5,10 @@
- #ifndef _RTE_DEV_INFO_H_
- #define _RTE_DEV_INFO_H_
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #include <stdint.h>
- 
- /*
-@@ -48,4 +52,8 @@ struct rte_eth_dev_module_info {
- #define RTE_ETH_MODULE_SFF_8436_LEN         256
- #define RTE_ETH_MODULE_SFF_8436_MAX_LEN     640
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif /* _RTE_DEV_INFO_H_ */