When passing the element count to vu_init_elem(), vu_collect(), or using
it as a loop bound, use ARRAY_SIZE(elem) instead of the VIRTQUEUE_MAX_SIZE.
No functional change.
Signed-off-by: Laurent Vivier
Reviewed-by: David Gibson
---
tcp_vu.c | 6 +++---
udp_vu.c | 4 ++--
vu_common.c | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tcp_vu.c b/tcp_vu.c
index 3adead5f33fa..8da2dcfe78d0 100644
--- a/tcp_vu.c
+++ b/tcp_vu.c
@@ -210,17 +210,17 @@ static ssize_t tcp_vu_sock_recv(const struct ctx *c, struct vu_virtq *vq,
hdrlen = tcp_vu_hdrlen(v6);
- vu_init_elem(elem, &iov_vu[DISCARD_IOV_NUM], VIRTQUEUE_MAX_SIZE);
+ vu_init_elem(elem, &iov_vu[DISCARD_IOV_NUM], ARRAY_SIZE(elem));
elem_cnt = 0;
*head_cnt = 0;
- while (fillsize > 0 && elem_cnt < VIRTQUEUE_MAX_SIZE) {
+ while (fillsize > 0 && elem_cnt < ARRAY_SIZE(elem)) {
struct iovec *iov;
size_t frame_size, dlen;
int cnt;
cnt = vu_collect(vdev, vq, &elem[elem_cnt],
- VIRTQUEUE_MAX_SIZE - elem_cnt,
+ ARRAY_SIZE(elem) - elem_cnt,
MIN(mss, fillsize) + hdrlen, &frame_size);
if (cnt == 0)
break;
diff --git a/udp_vu.c b/udp_vu.c
index ef9d26118eaf..439f2cb399b7 100644
--- a/udp_vu.c
+++ b/udp_vu.c
@@ -89,9 +89,9 @@ static int udp_vu_sock_recv(const struct ctx *c, struct vu_virtq *vq, int s,
/* compute L2 header length */
hdrlen = udp_vu_hdrlen(v6);
- vu_init_elem(elem, iov_vu, VIRTQUEUE_MAX_SIZE);
+ vu_init_elem(elem, iov_vu, ARRAY_SIZE(elem));
- iov_cnt = vu_collect(vdev, vq, elem, VIRTQUEUE_MAX_SIZE,
+ iov_cnt = vu_collect(vdev, vq, elem, ARRAY_SIZE(elem),
IP_MAX_MTU + ETH_HLEN + VNET_HLEN, NULL);
if (iov_cnt == 0)
return -1;
diff --git a/vu_common.c b/vu_common.c
index 8ea05dd30890..8afa5199908f 100644
--- a/vu_common.c
+++ b/vu_common.c
@@ -193,7 +193,7 @@ static void vu_handle_tx(struct vu_dev *vdev, int index,
count = 0;
out_sg_count = 0;
- while (count < VIRTQUEUE_MAX_SIZE &&
+ while (count < ARRAY_SIZE(elem) &&
out_sg_count + VU_MAX_TX_BUFFER_NB <= VIRTQUEUE_MAX_SIZE) {
int ret;
struct iov_tail data;
@@ -278,10 +278,10 @@ int vu_send_single(const struct ctx *c, const void *buf, size_t size)
return -1;
}
- vu_init_elem(elem, in_sg, VIRTQUEUE_MAX_SIZE);
+ vu_init_elem(elem, in_sg, ARRAY_SIZE(elem));
size += VNET_HLEN;
- elem_cnt = vu_collect(vdev, vq, elem, VIRTQUEUE_MAX_SIZE, size, &total);
+ elem_cnt = vu_collect(vdev, vq, elem, ARRAY_SIZE(elem), size, &total);
if (total < size) {
debug("vu_send_single: no space to send the data "
"elem_cnt %d size %zd", elem_cnt, total);
--
2.53.0