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

Kevin Traynor ktraynor at redhat.com
Fri Jul 17 18:31:59 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.10

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/23/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
>From e19516315d5d070801a868f98381151d0a96bc29 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 eaa9d072cc..c8fd61f773 100644
--- a/lib/librte_pci/rte_pci.h
+++ b/lib/librte_pci/rte_pci.h
@@ -29,5 +29,5 @@ extern "C" {
 
 /** 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")
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-17 17:17:00.614522666 +0100
+++ 0011-pci-fix-address-domain-format-size.patch	2020-07-17 17:16:59.978771468 +0100
@@ -1 +1 @@
-From 8517072c8715556968b59e5872f580c7cad2e53c Mon Sep 17 00:00:00 2001
+From e19516315d5d070801a868f98381151d0a96bc29 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8517072c8715556968b59e5872f580c7cad2e53c ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 9337079178..104b2bb858 100644
+index eaa9d072cc..c8fd61f773 100644
@@ -28 +29 @@
-@@ -24,5 +24,5 @@ extern "C" {
+@@ -29,5 +29,5 @@ extern "C" {



More information about the stable mailing list