Re: [PATCH 24/24] vhost-user: remove tap_send_frames_vu()

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 2243 bytes --]

On Fri, Feb 02, 2024 at 03:11:51PM +0100, Laurent Vivier wrote:
> As TCP and UDP use now directly vhost-user we don't need this function
> anymore. Other protocols (ICMP, ARP, DHCP, ...) use tap_send()/vu_send()
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

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

> ---
>  tap.c        |  3 +--
>  vhost_user.c | 16 ----------------
>  vhost_user.h |  2 --
>  3 files changed, 1 insertion(+), 20 deletions(-)
> 
> diff --git a/tap.c b/tap.c
> index 930e48689497..ed1744f72e37 100644
> --- a/tap.c
> +++ b/tap.c
> @@ -440,8 +440,7 @@ size_t tap_send_frames(const struct ctx *c, const struct iovec *iov, size_t n)
>  		m = tap_send_frames_passt(c, iov, n);
>  		break;
>  	case MODE_VU:
> -		m = tap_send_frames_vu(c, iov, n);
> -		break;
> +		ASSERT(0);
>  	default:
>  		m = 0;
>  		break;
> diff --git a/vhost_user.c b/vhost_user.c
> index 9cc07c8312c0..4ceeeb58f792 100644
> --- a/vhost_user.c
> +++ b/vhost_user.c
> @@ -653,22 +653,6 @@ err:
>  	return offset;
>  }
>  
> -size_t tap_send_frames_vu(const struct ctx *c, const struct iovec *iov, size_t n)
> -{
> -	size_t i;
> -	int ret;
> -
> -	debug("tap_send_frames_vu n %zd", n);
> -
> -	for (i = 0; i < n; i++) {
> -		ret = vu_send(c, iov[i].iov_base, iov[i].iov_len);
> -		if (ret < 0)
> -			break;
> -	}
> -	debug("count %zd", i);
> -	return i;
> -}
> -
>  static void vu_handle_tx(VuDev *vdev, int index)
>  {
>  	struct ctx *c = (struct ctx *) ((char *)vdev - offsetof(struct ctx, vdev));
> diff --git a/vhost_user.h b/vhost_user.h
> index 25f0b617ab40..44678ddabef4 100644
> --- a/vhost_user.h
> +++ b/vhost_user.h
> @@ -129,8 +129,6 @@ static inline bool vu_queue_started(const VuVirtq *vq)
>  	return vq->started;
>  }
>  
> -size_t tap_send_frames_vu(const struct ctx *c, const struct iovec *iov,
> -			  size_t n);
>  int vu_send(const struct ctx *c, const void *data, size_t len);
>  void vu_print_capabilities(void);
>  void vu_init(struct ctx *c);

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]