On Fri, Aug 08, 2025 at 04:01:40PM +0200, Laurent Vivier wrote:
> _buf is not used in the macro. Remove it.
> Remove it also from PACKET_POOL_NOINIT() as it was needed
> for PACKET_POOL_DECL().
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

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

> ---
>  packet.h | 6 +++---
>  tap.c    | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/packet.h b/packet.h
> index 286b6b9994db..43b9022075d1 100644
> --- a/packet.h
> +++ b/packet.h
> @@ -43,7 +43,7 @@ void pool_flush(struct pool *p);
>  #define packet_get(p, idx, data)					\
>  	packet_get_do(p, idx, data, __func__, __LINE__)
>  
> -#define PACKET_POOL_DECL(_name, _size, _buf)				\
> +#define PACKET_POOL_DECL(_name, _size)					\
>  struct _name ## _t {							\
>  	char *buf;							\
>  	size_t buf_size;						\
> @@ -62,7 +62,7 @@ struct _name ## _t {							\
>  #define PACKET_INIT(name, size, buf, buf_size)				\
>  	(struct name ## _t) PACKET_POOL_INIT_NOCAST(size, buf, buf_size)
>  
> -#define PACKET_POOL_NOINIT(name, size, buf)				\
> -	PACKET_POOL_DECL(name, size, buf) name ## _storage;		\
> +#define PACKET_POOL_NOINIT(name, size)					\
> +	PACKET_POOL_DECL(name, size) name ## _storage;			\
>  	static struct pool *name = (struct pool *)&name ## _storage
>  #endif /* PACKET_H */
> diff --git a/tap.c b/tap.c
> index d327ec0c3d54..bbc786468455 100644
> --- a/tap.c
> +++ b/tap.c
> @@ -95,8 +95,8 @@ CHECK_FRAME_LEN(L2_MAX_LEN_VU);
>  		     ETH_HLEN + sizeof(struct ipv6hdr) + sizeof(struct udphdr))
>  
>  /* IPv4 (plus ARP) and IPv6 message batches from tap/guest to IP handlers */
> -static PACKET_POOL_NOINIT(pool_tap4, TAP_MSGS_IP4, pkt_buf);
> -static PACKET_POOL_NOINIT(pool_tap6, TAP_MSGS_IP6, pkt_buf);
> +static PACKET_POOL_NOINIT(pool_tap4, TAP_MSGS_IP4);
> +static PACKET_POOL_NOINIT(pool_tap6, TAP_MSGS_IP6);
>  
>  #define TAP_SEQS		128 /* Different L4 tuples in one batch */
>  #define FRAGMENT_MSG_RATE	10  /* # seconds between fragment warnings */
> @@ -555,7 +555,7 @@ void eth_update_mac(struct ethhdr *eh,
>  		memcpy(eh->h_source, eth_s, sizeof(eh->h_source));
>  }
>  
> -PACKET_POOL_DECL(pool_l4, UIO_MAXIOV, pkt_buf);
> +PACKET_POOL_DECL(pool_l4, UIO_MAXIOV);
>  
>  /**
>   * struct l4_seq4_t - Message sequence for one protocol handler call, IPv4

-- 
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