[dpdk-stable] patch 'pci: remove unneeded includes in public header file' has been queued to stable release 19.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Tue May 19 14:53:24 CEST 2020


Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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 027e022a183783ac6d37df4dab9a82f32fc4744b Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Mon, 16 Mar 2020 11:29:51 +0000
Subject: [PATCH] pci: remove unneeded includes in public header file

[ upstream commit 0dcba52562873f5efa437b61821be7c1bd459a34 ]

The rte_pci.h file includes more header files than are actually needed,
which means that all users of it also include those headers. This patch
removes the unneeded headers - adding them elsewhere where other components
were requiring them but not including them directly.

Fixes: c752998b5e2e ("pci: introduce library and driver")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Thomas Monjalon <thomas at monjalon.net>
---
 drivers/bus/ifpga/rte_bus_ifpga.h | 1 +
 lib/librte_pci/rte_pci.h          | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/bus/ifpga/rte_bus_ifpga.h b/drivers/bus/ifpga/rte_bus_ifpga.h
index 88a6289642..a6eeaaf568 100644
--- a/drivers/bus/ifpga/rte_bus_ifpga.h
+++ b/drivers/bus/ifpga/rte_bus_ifpga.h
@@ -17,6 +17,7 @@ extern "C" {
 
 #include <rte_bus.h>
 #include <rte_pci.h>
+#include <rte_interrupts.h>
 #include <rte_spinlock.h>
 
 /** Name of Intel FPGA Bus */
diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h
index c87891405c..c591af010d 100644
--- a/lib/librte_pci/rte_pci.h
+++ b/lib/librte_pci/rte_pci.h
@@ -16,17 +16,11 @@
 extern "C" {
 #endif
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#include <errno.h>
 #include <sys/queue.h>
-#include <stdint.h>
 #include <inttypes.h>
 
-#include <rte_debug.h>
-#include <rte_interrupts.h>
-
 /** Formatting string for PCI device identifier: Ex: 0000:00:01.0 */
 #define PCI_PRI_FMT "%.4" PRIx16 ":%.2" PRIx8 ":%.2" PRIx8 ".%" PRIx8
 #define PCI_PRI_STR_SIZE sizeof("XXXXXXXX:XX:XX.X")
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:19.384063851 +0100
+++ 0014-pci-remove-unneeded-includes-in-public-header-file.patch	2020-05-19 13:56:18.179501099 +0100
@@ -1,23 +1,23 @@
-From 0dcba52562873f5efa437b61821be7c1bd459a34 Mon Sep 17 00:00:00 2001
+From 027e022a183783ac6d37df4dab9a82f32fc4744b Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Mon, 16 Mar 2020 11:29:51 +0000
 Subject: [PATCH] pci: remove unneeded includes in public header file
 
+[ upstream commit 0dcba52562873f5efa437b61821be7c1bd459a34 ]
+
 The rte_pci.h file includes more header files than are actually needed,
 which means that all users of it also include those headers. This patch
 removes the unneeded headers - adding them elsewhere where other components
 were requiring them but not including them directly.
 
 Fixes: c752998b5e2e ("pci: introduce library and driver")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Acked-by: Thomas Monjalon <thomas at monjalon.net>
 ---
  drivers/bus/ifpga/rte_bus_ifpga.h | 1 +
- drivers/common/mlx5/mlx5_common.h | 1 +
  lib/librte_pci/rte_pci.h          | 6 ------
- 3 files changed, 2 insertions(+), 6 deletions(-)
+ 2 files changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/drivers/bus/ifpga/rte_bus_ifpga.h b/drivers/bus/ifpga/rte_bus_ifpga.h
 index 88a6289642..a6eeaaf568 100644
@@ -31,18 +31,6 @@
  #include <rte_spinlock.h>
  
  /** Name of Intel FPGA Bus */
-diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h
-index 961c606340..16de1b3973 100644
---- a/drivers/common/mlx5/mlx5_common.h
-+++ b/drivers/common/mlx5/mlx5_common.h
-@@ -8,6 +8,7 @@
- #include <stdio.h>
- 
- #include <rte_pci.h>
-+#include <rte_debug.h>
- #include <rte_atomic.h>
- #include <rte_log.h>
- #include <rte_kvargs.h>
 diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h
 index c87891405c..c591af010d 100644
 --- a/lib/librte_pci/rte_pci.h


More information about the stable mailing list