From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1FCBEA0518 for ; Fri, 24 Jul 2020 14:04:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 16EE51C065; Fri, 24 Jul 2020 14:04:41 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 126DB1C065 for ; Fri, 24 Jul 2020 14:04:40 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id o8so7742215wmh.4 for ; Fri, 24 Jul 2020 05:04:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SfZ/LGi32vc27d11H5tL50ZgzvszbyxPVSqzyP2GKzM=; b=r6BSlLOKbuHOyRXEHI9ydxEOK67sfjHfkDiUE8XdoE4GiRYY4sWrck5jyvM6DN3OPK 9wLv6qmTxr8t5WOx0MF9P3JrfGXCs3wMEYVTu1SjsFiFzWrS/UxhYZaLRT8rZVVcQPYN BvAjGs6iZjQONCJEu7pxLRVL6D1CFDLoR0DWqdea8krkcUyfO39YWeElTW1iBPYodjvN mhqhOiVlqYyQcGjHYIQNF4r4KOh29D9ez4zxAkNGg6vZ7Wa618OYARswdROkbCGg8Qfv QjeL5/TvRIZYD7+pqAQcqHEfx+Dha3nX8FcvdU7TXNnFfJEOoEM5kt5fjeLo3hxT6Prr C9zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SfZ/LGi32vc27d11H5tL50ZgzvszbyxPVSqzyP2GKzM=; b=m4RYWVU3o/RTdUJceFv/5Afrsm2BzbVU5tn+/T5uW91RnMaX6RfLSmoiPpozXriqMT eBpRF+eAHcK4k1yfnh8cfsfxqRioWvajBB9ZLeHE2x+1G3ZzKrekoLVGN8aLFwJQhbdf 7qo2sUmcyF0VFLdNTfUmFLkfMyelnDw3FkV9EV6Z9ZumIu2Mtn7ZnzSF4lSCIbN0QSVn Og5q15R2c3gdkE5u/Rk6fbrKnzXGKhpdzMMHIg5eOy/6218YNqt+Y4dIMwjkLcRhB4gY AZVCaYNKOBJ6PdkTfqF/d0pGE3n76COQhE/YLSQy3RwipmWms2Kwk6nlHetZ+wp8pJ2i DiCg== X-Gm-Message-State: AOAM533GbWaA2aS3PTDAkyMwl1RlwoXuKDDQ/ckged6iwU7fMcb5e0Wa KZoHHYfhKMcqiYUb7e3MIvg= X-Google-Smtp-Source: ABdhPJw0py5oUXgjK/46zaRwkPxMUgTwpZluX2ECKrXKqLldHeYQRYiVbOB6M2TZwB2+ain6Yha/Jg== X-Received: by 2002:a7b:c1c2:: with SMTP id a2mr1718497wmj.74.1595592279810; Fri, 24 Jul 2020 05:04:39 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i4sm1182189wrw.26.2020.07.24.05.04.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:04:38 -0700 (PDT) From: luca.boccassi@gmail.com To: Tal Shnaiderman Cc: dpdk stable Date: Fri, 24 Jul 2020 12:58:16 +0100 Message-Id: <20200724120030.1863487-58-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'pci: fix address domain format size' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 --- 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 /** 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 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@dpdk.org Signed-off-by: Tal Shnaiderman --- @@ -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 +@@ -22,7 +22,7 @@ extern "C" { + #include /** Formatting string for PCI device identifier: Ex: 0000:00:01.0 */ -#define PCI_PRI_FMT "%.4" PRIx16 ":%.2" PRIx8 ":%.2" PRIx8 ".%" PRIx8