[dpdk-stable] patch 'pci: fix address domain format size' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/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 9cd4c0f0a74ecd514e61c2ddf15ccb37bf58b3ee Mon Sep 17 00:00:00 2001
From: Tal Shnaiderman <talshn at mellanox.com>
Date: Mon, 29 Jun 2020 15:37:36 +0300
Subject: [PATCH] pci: fix address domain format size

[ upstream commit 8517072c8715556968b59e5872f580c7cad2e53c ]

the struct rte_pci_addr defines domain as uint32_t variable however
the PCI_PRI_FMT macro used for logging the struct sets the format
of domain to uint16_t.

The mismatch causes the following warning messages
in Windows clang build:

format specifies type 'unsigned short' but the argument
has type 'uint32_t' (aka 'unsigned int') [-Wformat]

Fixes: af75078fece3 ("first public release")

Signed-off-by: Tal Shnaiderman <talshn at mellanox.com>
---
 lib/librte_pci/rte_pci.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h
index 4087771c1..db8391965 100644
--- a/lib/librte_pci/rte_pci.h
+++ b/lib/librte_pci/rte_pci.h
@@ -22,7 +22,7 @@ extern "C" {
 #include <inttypes.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_FMT "%.4" PRIx32 ":%.2" PRIx8 ":%.2" PRIx8 ".%" PRIx8
 #define PCI_PRI_STR_SIZE sizeof("XXXXXXXX:XX:XX.X")
 
 /** Short formatting string, without domain, for PCI device: Ex: 00:01.0 */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:50.838662061 +0100
+++ 0058-pci-fix-address-domain-format-size.patch	2020-07-24 12:53:48.275006236 +0100
@@ -1,8 +1,10 @@
-From 8517072c8715556968b59e5872f580c7cad2e53c Mon Sep 17 00:00:00 2001
+From 9cd4c0f0a74ecd514e61c2ddf15ccb37bf58b3ee Mon Sep 17 00:00:00 2001
 From: Tal Shnaiderman <talshn at mellanox.com>
 Date: Mon, 29 Jun 2020 15:37:36 +0300
 Subject: [PATCH] pci: fix address domain format size
 
+[ upstream commit 8517072c8715556968b59e5872f580c7cad2e53c ]
+
 the struct rte_pci_addr defines domain as uint32_t variable however
 the PCI_PRI_FMT macro used for logging the struct sets the format
 of domain to uint16_t.
@@ -14,7 +16,6 @@
 has type 'uint32_t' (aka 'unsigned int') [-Wformat]
 
 Fixes: af75078fece3 ("first public release")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tal Shnaiderman <talshn at mellanox.com>
 ---
@@ -22,11 +23,11 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h
-index 933707917..104b2bb85 100644
+index 4087771c1..db8391965 100644
 --- a/lib/librte_pci/rte_pci.h
 +++ b/lib/librte_pci/rte_pci.h
-@@ -23,7 +23,7 @@ extern "C" {
- #include <sys/types.h>
+@@ -22,7 +22,7 @@ extern "C" {
+ #include <inttypes.h>
  
  /** Formatting string for PCI device identifier: Ex: 0000:00:01.0 */
 -#define PCI_PRI_FMT "%.4" PRIx16 ":%.2" PRIx8 ":%.2" PRIx8 ".%" PRIx8