Skip to content

Commit

Permalink
net/virtio: do not use PMD log type
Browse files Browse the repository at this point in the history
[ upstream commit 88fa5bb ]

Virtio driver has its own logtype and should not use legacy
PMD logtype.

Fixes: 32c118f ("virtio: free mbuf's with threshold")
Fixes: e5f456a ("net/virtio: support in-order Rx and Tx")
Fixes: 1c8489d ("net/virtio-user: fix multi-process support")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
  • Loading branch information
shemminger authored and kevintraynor committed May 27, 2020
1 parent a5510de commit 38aef4b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/net/virtio/virtio_rxtx.c
Expand Up @@ -708,7 +708,7 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,
RTE_MIN(vq->vq_nentries / 4, DEFAULT_TX_FREE_THRESH);

if (tx_free_thresh >= (vq->vq_nentries - 3)) {
RTE_LOG(ERR, PMD, "tx_free_thresh must be less than the "
PMD_DRV_LOG(ERR, "tx_free_thresh must be less than the "
"number of TX entries minus 3 (%u)."
" (tx_free_thresh=%u port=%u queue=%u)\n",
vq->vq_nentries - 3,
Expand Down Expand Up @@ -751,7 +751,7 @@ virtio_discard_rxbuf(struct virtqueue *vq, struct rte_mbuf *m)
error = virtqueue_enqueue_recv_refill(vq, m);

if (unlikely(error)) {
RTE_LOG(ERR, PMD, "cannot requeue discarded mbuf");
PMD_DRV_LOG(ERR, "cannot requeue discarded mbuf");
rte_pktmbuf_free(m);
}
}
Expand All @@ -763,7 +763,7 @@ virtio_discard_rxbuf_inorder(struct virtqueue *vq, struct rte_mbuf *m)

error = virtqueue_enqueue_refill_inorder(vq, &m, 1);
if (unlikely(error)) {
RTE_LOG(ERR, PMD, "cannot requeue discarded mbuf");
PMD_DRV_LOG(ERR, "cannot requeue discarded mbuf");
rte_pktmbuf_free(m);
}
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/virtio/virtio_user_ethdev.c
Expand Up @@ -471,7 +471,7 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
const char *name = rte_vdev_device_name(dev);
eth_dev = rte_eth_dev_attach_secondary(name);
if (!eth_dev) {
RTE_LOG(ERR, PMD, "Failed to probe %s\n", name);
PMD_INIT_LOG(ERR, "Failed to probe %s", name);
return -1;
}

Expand Down

0 comments on commit 38aef4b

Please sign in to comment.