On Wed, Apr 02, 2025 at 07:23:31PM +0200, Laurent Vivier wrote:
> Use packet_base() and extract headers using IOV_REMOVE_HEADER()
> rather than packet_get().
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

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

> ---
>  arp.c    | 12 +++++++++---
>  packet.c |  1 -
>  2 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/arp.c b/arp.c
> index 9d68d7c3b602..cd0e15de7de0 100644
> --- a/arp.c
> +++ b/arp.c
> @@ -77,11 +77,17 @@ int arp(const struct ctx *c, const struct pool *p)
>  	const struct ethhdr *eh;
>  	const struct arphdr *ah;
>  	const struct arpmsg *am;
> +	struct iov_tail data;
> +	struct arphdr  ahc;
> +	struct ethhdr ehc;
> +	struct arpmsg amc;
>  
> -	eh = packet_get(p, 0, 0,			 sizeof(*eh), NULL);
> -	ah = packet_get(p, 0, sizeof(*eh),		 sizeof(*ah), NULL);
> -	am = packet_get(p, 0, sizeof(*eh) + sizeof(*ah), sizeof(*am), NULL);
> +	if (!packet_base(p, 0, &data))
> +		return -1;
>  
> +	eh = IOV_REMOVE_HEADER(&data, ehc);
> +	ah = IOV_REMOVE_HEADER(&data, ahc);
> +	am = IOV_REMOVE_HEADER(&data, amc);
>  	if (!eh || !ah || !am)
>  		return -1;
>  
> diff --git a/packet.c b/packet.c
> index 25ede38b94cb..8066ac12502b 100644
> --- a/packet.c
> +++ b/packet.c
> @@ -165,7 +165,6 @@ void *packet_get_do(const struct pool *p, size_t idx, size_t offset,
>   *
>   * Return: pointer to start of data range, NULL on invalid range or descriptor
>   */
> -/* cppcheck-suppress unusedFunction */
>  bool packet_base_do(const struct pool *p, size_t idx,
>  		   struct iov_tail *data,
>  		   const char *func, int line)

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