[dpdk-stable] patch 'net/virtio: fix outdated comment' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/03/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/84edbc742b21efa742ee0f97fe4230b3f1d6c0ca

Thanks.

Kevin.

---
>From 84edbc742b21efa742ee0f97fe4230b3f1d6c0ca Mon Sep 17 00:00:00 2001
From: Xiaolong Ye <xiaolong.ye at intel.com>
Date: Sat, 7 Mar 2020 21:22:34 +0800
Subject: [PATCH] net/virtio: fix outdated comment

[ upstream commit f6ac14f13b040fb44db6ed4ab392865fb6648201 ]

Fix comment that is no more correct as the code evolved.

Fixes: 9470427c88e1 ("net/virtio: do not store PCI device pointer at shared memory")

Signed-off-by: Xiaolong Ye <xiaolong.ye at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_ethdev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 2d4c6c7fa9..be24677093 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -350,5 +350,5 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)
 
 	if (!rte_is_power_of_2(vq_size)) {
-		PMD_INIT_LOG(ERR, "virtqueue size is not powerof 2");
+		PMD_INIT_LOG(ERR, "virtqueue size is not power of 2");
 		return -EINVAL;
 	}
@@ -465,6 +465,6 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)
 	}
 
-	/* For virtio_user case (that is when hw->dev is NULL), we use
-	 * virtual address. And we need properly set _offset_, please see
+	/* For virtio_user case (that is when hw->virtio_user_dev is not NULL),
+	 * we use virtual address. And we need properly set _offset_, please see
 	 * VIRTIO_MBUF_DATA_DMA_ADDR in virtqueue.h for more information.
 	 */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:02.950121217 +0100
+++ 0074-net-virtio-fix-outdated-comment.patch	2020-05-28 17:12:59.157555133 +0100
@@ -1 +1 @@
-From f6ac14f13b040fb44db6ed4ab392865fb6648201 Mon Sep 17 00:00:00 2001
+From 84edbc742b21efa742ee0f97fe4230b3f1d6c0ca Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f6ac14f13b040fb44db6ed4ab392865fb6648201 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index f9d0ea70db..35203940a7 100644
+index 2d4c6c7fa9..be24677093 100644
@@ -21 +22 @@
-@@ -467,5 +467,5 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)
+@@ -350,5 +350,5 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)
@@ -23,3 +24,3 @@
- 	if (!vtpci_packed_queue(hw) && !rte_is_power_of_2(vq_size)) {
--		PMD_INIT_LOG(ERR, "split virtqueue size is not powerof 2");
-+		PMD_INIT_LOG(ERR, "split virtqueue size is not power of 2");
+ 	if (!rte_is_power_of_2(vq_size)) {
+-		PMD_INIT_LOG(ERR, "virtqueue size is not powerof 2");
++		PMD_INIT_LOG(ERR, "virtqueue size is not power of 2");
@@ -28 +29 @@
-@@ -589,6 +589,6 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)
+@@ -465,6 +465,6 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)