From 60e35ab2bd11b9960f3e9430fe4b259aa3d6c764 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Fri, 19 Jan 2024 13:18:31 +0100 Subject: vhost-user: remove tap_send_frames_vu() 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 --- 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 3c4a222..e36a903 100644 --- a/tap.c +++ b/tap.c @@ -477,8 +477,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 9cc07c8..4ceeeb5 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 25f0b61..44678dd 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); -- cgit v1.2.3