[dpdk-stable] patch 'net/virtio: do not use PMD log type' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.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 11/12/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/49a2b0ca693e364b05ab14d500382f0edb609719

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 49a2b0ca693e364b05ab14d500382f0edb609719 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Thu, 16 Sep 2021 15:25:02 +0200
Subject: [PATCH] net/virtio: do not use PMD log type
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit db48aaa2340047e6fbadbe0db9a76ff712e86ec4 ]

Fixes: 1982462eadea ("net/virtio: add Rx free threshold setting")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_rxtx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 7fb41f12af..bb7f3a36d4 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -695,16 +695,16 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
 			RTE_MIN(vq->vq_nentries / 4, DEFAULT_RX_FREE_THRESH);
 
 	if (rx_free_thresh & 0x3) {
-		RTE_LOG(ERR, PMD, "rx_free_thresh must be multiples of four."
-			" (rx_free_thresh=%u port=%u queue=%u)\n",
+		PMD_INIT_LOG(ERR, "rx_free_thresh must be multiples of four."
+			" (rx_free_thresh=%u port=%u queue=%u)",
 			rx_free_thresh, dev->data->port_id, queue_idx);
 		return -EINVAL;
 	}
 
 	if (rx_free_thresh >= vq->vq_nentries) {
-		RTE_LOG(ERR, PMD, "rx_free_thresh must be less than the "
+		PMD_INIT_LOG(ERR, "rx_free_thresh must be less than the "
 			"number of RX entries (%u)."
-			" (rx_free_thresh=%u port=%u queue=%u)\n",
+			" (rx_free_thresh=%u port=%u queue=%u)",
 			vq->vq_nentries,
 			rx_free_thresh, dev->data->port_id, queue_idx);
 		return -EINVAL;
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:06.076203488 +0800
+++ 0091-net-virtio-do-not-use-PMD-log-type.patch	2021-11-10 14:17:01.850746254 +0800
@@ -1 +1 @@
-From db48aaa2340047e6fbadbe0db9a76ff712e86ec4 Mon Sep 17 00:00:00 2001
+From 49a2b0ca693e364b05ab14d500382f0edb609719 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit db48aaa2340047e6fbadbe0db9a76ff712e86ec4 ]
@@ -7 +9,0 @@
-Cc: stable at dpdk.org
@@ -16 +18 @@
-index 501ca1582d..b9d7c8d18f 100644
+index 7fb41f12af..bb7f3a36d4 100644
@@ -19 +21 @@
-@@ -690,16 +690,16 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -695,16 +695,16 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,