patch 'buildtools/chkincs: check driver specific headers' has been queued to stable release 22.11.7

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.7

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

Thanks.

Luca Boccassi

---
From 8a4a31ed6ee1185215ad6d2b15d4b0190a32f096 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Mon, 23 Oct 2023 13:50:28 +0200
Subject: [PATCH] buildtools/chkincs: check driver specific headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 90cb8ff8196f9b9c1c2bcee1c94ea583789bb63f ]

Only driver headers exported by libraries were checked.
Add driver specific headers to the checked headers list.

This reveals a small issue with the vmbus driver header as some driver
headers rely on it.

Fixes: b232b2aa212b ("buildtools/chkincs: check SDK headers for C++ compatibility")
Fixes: 84aaf06d817c ("bus/vmbus: make driver-only headers private")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
 buildtools/chkincs/meson.build | 3 +++
 drivers/meson.build            | 1 +
 2 files changed, 4 insertions(+)

diff --git a/buildtools/chkincs/meson.build b/buildtools/chkincs/meson.build
index 378c2f19ef..0f14e02104 100644
--- a/buildtools/chkincs/meson.build
+++ b/buildtools/chkincs/meson.build
@@ -21,6 +21,9 @@ sources += gen_c_files.process(dpdk_chkinc_headers)
 # some driver SDK headers depend on these two buses, which are mandatory in build
 # so we always include them in deps list
 deps = [get_variable('shared_rte_bus_vdev'), get_variable('shared_rte_bus_pci')]
+if dpdk_conf.has('RTE_BUS_VMBUS')
+    deps += get_variable('shared_rte_bus_vmbus')
+endif
 # add the rest of the libs to the dependencies
 foreach l:enabled_libs
     deps += get_variable('shared_rte_' + l)
diff --git a/drivers/meson.build b/drivers/meson.build
index b4d9252888..175beec15e 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -175,6 +175,7 @@ foreach subpath:subdirs
         if get_option('enable_driver_sdk')
             install_headers(driver_sdk_headers)
         endif
+        dpdk_chkinc_headers += driver_sdk_headers
 
         if headers.length() > 0
             dpdk_includes += include_directories(drv_path)
-- 
2.45.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-12 22:06:58.735088790 +0000
+++ 0001-buildtools-chkincs-check-driver-specific-headers.patch	2024-11-12 22:06:58.623306511 +0000
@@ -1 +1 @@
-From 90cb8ff8196f9b9c1c2bcee1c94ea583789bb63f Mon Sep 17 00:00:00 2001
+From 8a4a31ed6ee1185215ad6d2b15d4b0190a32f096 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 90cb8ff8196f9b9c1c2bcee1c94ea583789bb63f ]
+
@@ -26 +28 @@
-index 787d70272b..ed65105599 100644
+index 378c2f19ef..0f14e02104 100644
@@ -29 +31 @@
-@@ -19,6 +19,9 @@ sources += gen_c_files.process(dpdk_chkinc_headers)
+@@ -21,6 +21,9 @@ sources += gen_c_files.process(dpdk_chkinc_headers)
@@ -37 +39 @@
- foreach l:dpdk_libs_enabled
+ foreach l:enabled_libs
@@ -40 +42 @@
-index 2733306698..5270160c56 100644
+index b4d9252888..175beec15e 100644
@@ -43 +45 @@
-@@ -220,6 +220,7 @@ foreach subpath:subdirs
+@@ -175,6 +175,7 @@ foreach subpath:subdirs