On Tue, Aug 05, 2025 at 05:46:19PM +0200, Laurent Vivier wrote:
> As we have removed packet_get(), we can rename packet_data() to packet_get()
> as the name is clearer.
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  arp.c    | 2 +-
>  dhcp.c   | 2 +-
>  dhcpv6.c | 2 +-
>  icmp.c   | 2 +-
>  ndp.c    | 2 +-
>  packet.c | 8 ++++----
>  packet.h | 9 ++++-----
>  tap.c    | 6 +++---
>  tcp.c    | 4 ++--
>  udp.c    | 4 ++--
>  10 files changed, 20 insertions(+), 21 deletions(-)
> 
> diff --git a/arp.c b/arp.c
> index b3ac42082841..8b97df633e70 100644
> --- a/arp.c
> +++ b/arp.c
> @@ -82,7 +82,7 @@ int arp(const struct ctx *c, const struct pool *p)
>  	const struct arpmsg *am;
>  	struct iov_tail data;
>  
> -	if (!packet_data(p, 0, &data))
> +	if (!packet_get(p, 0, &data))
>  		return -1;
>  
>  	eh = IOV_REMOVE_HEADER(&data, eh_storage);
> diff --git a/dhcp.c b/dhcp.c
> index cf73d4b07767..47317f334945 100644
> --- a/dhcp.c
> +++ b/dhcp.c
> @@ -317,7 +317,7 @@ int dhcp(const struct ctx *c, const struct pool *p)
>  	unsigned int i;
>  	struct msg m_storage;
>  
> -	if (!packet_data(p, 0, &data))
> +	if (!packet_get(p, 0, &data))
>  		return -1;
>  
>  	eh = IOV_REMOVE_HEADER(&data, eh_storage);
> diff --git a/dhcpv6.c b/dhcpv6.c
> index e93acaf9955e..f54a75c642df 100644
> --- a/dhcpv6.c
> +++ b/dhcpv6.c
> @@ -562,7 +562,7 @@ int dhcpv6(struct ctx *c, const struct pool *p,
>  	const struct udphdr *uh;
>  	size_t mlen, n;
>  
> -	if (!packet_data(p, 0, &data))
> +	if (!packet_get(p, 0, &data))
>  		return -1;
>  
>  	uh = IOV_REMOVE_HEADER(&data, uh_storage);
> diff --git a/icmp.c b/icmp.c
> index fdfc857b5ae8..71c496540310 100644
> --- a/icmp.c
> +++ b/icmp.c
> @@ -251,7 +251,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af,
>  	(void)saddr;
>  	ASSERT(pif == PIF_TAP);
>  
> -	if (!packet_data(p, 0, &data))
> +	if (!packet_get(p, 0, &data))
>  		return -1;
>  
>  	if (af == AF_INET) {
> diff --git a/ndp.c b/ndp.c
> index 5de4e508dc52..ba87a0aaa6e9 100644
> --- a/ndp.c
> +++ b/ndp.c
> @@ -354,7 +354,7 @@ int ndp(const struct ctx *c, const struct icmp6hdr *ih,
>  		const struct ndp_ns *ns;
>  		struct iov_tail data;
>  
> -		if (!packet_data(p, 0, &data))
> +		if (!packet_get(p, 0, &data))
>  			return -1;
>  
>  		ns = IOV_REMOVE_HEADER(&data, ns_storage);
> diff --git a/packet.c b/packet.c
> index 5da18bafa576..cbc43c2fc22d 100644
> --- a/packet.c
> +++ b/packet.c
> @@ -122,7 +122,7 @@ void packet_add_do(struct pool *p, struct iov_tail *data,
>  }
>  
>  /**
> - * packet_data_do() - Get data range from packet descriptor from given pool
> + * packet_get_do() - Get data range from packet descriptor from given pool
>   * @p:		Packet pool
>   * @idx:	Index of packet descriptor in pool
>   * @data:	IOV tail to store the address of the data (output)
> @@ -132,9 +132,9 @@ void packet_add_do(struct pool *p, struct iov_tail *data,
>   * Return: false if packet index is invalid, true otherwise.
>   * 	   If something wrong with @data, don't return at all (assert).
>   */
> -bool packet_data_do(const struct pool *p, size_t idx,
> -		    struct iov_tail *data,
> -		    const char *func, int line)
> +bool packet_get_do(const struct pool *p, size_t idx,
> +		   struct iov_tail *data,
> +		   const char *func, int line)
>  {
>  	size_t i;
>  
> diff --git a/packet.h b/packet.h
> index dab8274fa5c5..7afe80ef3fcf 100644
> --- a/packet.h
> +++ b/packet.h
> @@ -33,16 +33,15 @@ struct pool {
>  int vu_packet_check_range(void *buf, const char *ptr, size_t len);
>  void packet_add_do(struct pool *p, struct iov_tail *data,
>  		   const char *func, int line);
> -bool packet_data_do(const struct pool *p, const size_t idx,
> -		    struct iov_tail *data,
> -		    const char *func, int line);
> +bool packet_get_do(const struct pool *p, const size_t idx,
> +		   struct iov_tail *data, const char *func, int line);
>  bool pool_full(const struct pool *p);
>  void pool_flush(struct pool *p);
>  
>  #define packet_add(p, data)					\
>  	packet_add_do(p, data, __func__, __LINE__)
> -#define packet_data(p, idx, data)					\
> -	packet_data_do(p, idx, data, __func__, __LINE__)
> +#define packet_get(p, idx, data)					\
> +	packet_get_do(p, idx, data, __func__, __LINE__)
>  
>  #define PACKET_POOL_DECL(_name, _size, _buf)				\
>  struct _name ## _t {							\
> diff --git a/tap.c b/tap.c
> index 983f39ee8ee8..1d2e6fd802e9 100644
> --- a/tap.c
> +++ b/tap.c
> @@ -715,7 +715,7 @@ resume:
>  		struct iov_tail data;
>  		struct iphdr *iph;
>  
> -		if (!packet_data(in, i, &data))
> +		if (!packet_get(in, i, &data))
>  			continue;
>  
>  		eh = IOV_PEEK_HEADER(&data, eh_storage);
> @@ -790,7 +790,7 @@ resume:
>  
>  			PACKET_POOL_P(pkt, 1, in->buf, in->buf_size);
>  
> -			packet_data(in, i, &eh_data);
> +			packet_get(in, i, &eh_data);
>  			packet_add(pkt, &eh_data);
>  			if (dhcp(c, pkt))
>  				continue;
> @@ -905,7 +905,7 @@ resume:
>  		struct ipv6hdr *ip6h;
>  		uint8_t proto;
>  
> -		if (!packet_data(in, i, &data))
> +		if (!packet_get(in, i, &data))
>  			return -1;
>  
>  		eh = IOV_REMOVE_HEADER(&data, eh_storage);
> diff --git a/tcp.c b/tcp.c
> index e0efc4cacb9b..4ba066fd1cac 100644
> --- a/tcp.c
> +++ b/tcp.c
> @@ -1657,7 +1657,7 @@ static int tcp_data_from_tap(const struct ctx *c, struct tcp_tap_conn *conn,
>  		size_t off, size;
>  		int count;
>  
> -		if (!packet_data(p, i, &data))
> +		if (!packet_get(p, i, &data))
>  			return -1;
>  
>  		th = IOV_PEEK_HEADER(&data, th_storage);
> @@ -1988,7 +1988,7 @@ int tcp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af,
>  
>  	(void)pif;
>  
> -	if (!packet_data(p, idx, &data))
> +	if (!packet_get(p, idx, &data))
>  		return 1;
>  
>  	l4len = iov_tail_size(&data);
> diff --git a/udp.c b/udp.c
> index 3c25f2e0ae97..86585b7e0942 100644
> --- a/udp.c
> +++ b/udp.c
> @@ -990,7 +990,7 @@ int udp_tap_handler(const struct ctx *c, uint8_t pif,
>  
>  	ASSERT(!c->no_udp);
>  
> -	if (!packet_data(p, idx, &data))
> +	if (!packet_get(p, idx, &data))
>  		return 1;
>  
>  	uh = IOV_PEEK_HEADER(&data, uh_storage);
> @@ -1033,7 +1033,7 @@ int udp_tap_handler(const struct ctx *c, uint8_t pif,
>  	for (i = 0, j = 0; i < (int)p->count - idx && j < UIO_MAXIOV; i++) {
>  		const struct udphdr *uh_send;
>  
> -		if (!packet_data(p, idx + i, &data))
> +		if (!packet_get(p, idx + i, &data))
>  			return p->count - idx;
>  
>  		uh_send = IOV_REMOVE_HEADER(&data, uh_storage);

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson