* [dpdk-stable] [PATCH v16.11 LTS] vhost: fix compilation issue when vhost debug enabled
@ 2018-04-23 16:31 Maxime Coquelin
2018-04-23 16:49 ` Luca Boccassi
0 siblings, 1 reply; 2+ messages in thread
From: Maxime Coquelin @ 2018-04-23 16:31 UTC (permalink / raw)
To: stable, bluca; +Cc: Maxime Coquelin
This patch fixes below compilation issue when
RTE_LIBRTE_VHOST_DEBUG is enabled:
In file included from /home/max/projects/src/mainline/dpdk/lib/librte_vhost/virtio_net.c:50:0:
./lib/librte_vhost/virtio_net.c: In function ‘copy_mbuf_to_desc’:
./lib/librte_vhost/vhost.h:205:42: warning: format ‘%d’ expects argument of type ‘int’, but argument 5 has type ‘uint64_t {aka long unsigned int}’ [-Wformat=]
snprintf(packet, VHOST_MAX_PRINT_BUFF, "(%d) Header size %d: ", (device->vid), (size)); \
^
/home/max/projects/src/mainline/dpdk/lib/librte_vhost/virtio_net.c:301:4: note: in expansion of macro ‘PRINT_PACKET’
PRINT_PACKET(dev, (uintptr_t)dst, len, 0);
^~~~~~~~~~~~
Fixes: 067047a90055 ("vhost: handle virtually non-contiguous buffers in Tx")
Fixes: dd906b814d9a ("vhost: handle virtually non-contiguous buffers in Rx")
Fixes: 2b8d39414619 ("vhost: handle virtually non-contiguous buffers in Rx-mrg")
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/librte_vhost/virtio_net.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index 745cc53f4..871a58f72 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -298,7 +298,7 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vring_desc *descs,
rte_memcpy((void *)(uintptr_t)dst,
(void *)(uintptr_t)src, len);
- PRINT_PACKET(dev, (uintptr_t)dst, len, 0);
+ PRINT_PACKET(dev, (uintptr_t)dst, (uint32_t)len, 0);
remain -= len;
guest_addr += len;
dst += len;
@@ -736,7 +736,7 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct rte_mbuf *m,
len);
PRINT_PACKET(dev, (uintptr_t)dst,
- len, 0);
+ (uint32_t)len, 0);
remain -= len;
guest_addr += len;
@@ -1116,7 +1116,7 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vring_desc *descs,
rte_prefetch0((void *)(uintptr_t)(desc_addr + desc_offset));
PRINT_PACKET(dev, (uintptr_t)(desc_addr + desc_offset),
- desc_chunck_len, 0);
+ (uint32_t)desc_chunck_len, 0);
mbuf_offset = 0;
mbuf_avail = m->buf_len - RTE_PKTMBUF_HEADROOM;
@@ -1181,7 +1181,7 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vring_desc *descs,
desc_avail = desc->len;
PRINT_PACKET(dev, (uintptr_t)desc_addr,
- desc_chunck_len, 0);
+ (uint32_t)desc_chunck_len, 0);
} else if (unlikely(desc_chunck_len == 0)) {
desc_chunck_len = desc_avail;
desc_gaddr += desc_offset;
@@ -1194,7 +1194,7 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vring_desc *descs,
desc_offset = 0;
PRINT_PACKET(dev, (uintptr_t)desc_addr,
- desc_chunck_len, 0);
+ (uint32_t)desc_chunck_len, 0);
}
/*
--
2.14.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-stable] [PATCH v16.11 LTS] vhost: fix compilation issue when vhost debug enabled
2018-04-23 16:31 [dpdk-stable] [PATCH v16.11 LTS] vhost: fix compilation issue when vhost debug enabled Maxime Coquelin
@ 2018-04-23 16:49 ` Luca Boccassi
0 siblings, 0 replies; 2+ messages in thread
From: Luca Boccassi @ 2018-04-23 16:49 UTC (permalink / raw)
To: Maxime Coquelin, stable
On Mon, 2018-04-23 at 18:31 +0200, Maxime Coquelin wrote:
> This patch fixes below compilation issue when
> RTE_LIBRTE_VHOST_DEBUG is enabled:
>
> In file included from
> /home/max/projects/src/mainline/dpdk/lib/librte_vhost/virtio_net.c:50
> :0:
> ./lib/librte_vhost/virtio_net.c: In function ‘copy_mbuf_to_desc’:
> ./lib/librte_vhost/vhost.h:205:42: warning: format ‘%d’ expects
> argument of type ‘int’, but argument 5 has type ‘uint64_t {aka long
> unsigned int}’ [-Wformat=]
> snprintf(packet, VHOST_MAX_PRINT_BUFF, "(%d) Header size %d: ",
> (device->vid), (size)); \
> ^
> /home/max/projects/src/mainline/dpdk/lib/librte_vhost/virtio_net.c:30
> 1:4: note: in expansion of macro ‘PRINT_PACKET’
> PRINT_PACKET(dev, (uintptr_t)dst, len, 0);
> ^~~~~~~~~~~~
>
> Fixes: 067047a90055 ("vhost: handle virtually non-contiguous buffers
> in Tx")
> Fixes: dd906b814d9a ("vhost: handle virtually non-contiguous buffers
> in Rx")
> Fixes: 2b8d39414619 ("vhost: handle virtually non-contiguous buffers
> in Rx-mrg")
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
Thanks, applied and pushed to dpdk-stable/16.11 (removed the local path
from the log as requested)
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-23 16:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-23 16:31 [dpdk-stable] [PATCH v16.11 LTS] vhost: fix compilation issue when vhost debug enabled Maxime Coquelin
2018-04-23 16:49 ` Luca Boccassi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).