From 38c75be3139a117b02350dbda9d48d47aa57fa3d Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 22 Oct 2009 17:43:34 +0100 Subject: [PATCH] net: make tap_receive() re-use tap_receive_iov() code In future we will want to prepend a virtio_net header if the NIC didn't supply one but IFF_VNET_HDR is enabled on the interface. This is most easily achived by using writev() in all cases. Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori --- net.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/net.c b/net.c index acddb971c8..a96e42d8b0 100644 --- a/net.c +++ b/net.c @@ -1306,10 +1306,8 @@ static void tap_writable(void *opaque) qemu_flush_queued_packets(s->vc); } -static ssize_t tap_receive_iov(VLANClientState *vc, const struct iovec *iov, - int iovcnt) +static ssize_t tap_write_packet(TAPState *s, const struct iovec *iov, int iovcnt) { - TAPState *s = vc->opaque; ssize_t len; do { @@ -1324,16 +1322,25 @@ static ssize_t tap_receive_iov(VLANClientState *vc, const struct iovec *iov, return len; } +static ssize_t tap_receive_iov(VLANClientState *vc, const struct iovec *iov, + int iovcnt) +{ + TAPState *s = vc->opaque; + + return tap_write_packet(s, iov, iovcnt); +} + static ssize_t tap_receive(VLANClientState *vc, const uint8_t *buf, size_t size) { TAPState *s = vc->opaque; - ssize_t len; + struct iovec iov[1]; + int iovcnt = 0; - do { - len = write(s->fd, buf, size); - } while (len == -1 && (errno == EINTR || errno == EAGAIN)); + iov[iovcnt].iov_base = (char *)buf; + iov[iovcnt].iov_len = size; + iovcnt++; - return len; + return tap_write_packet(s, iov, iovcnt); } static int tap_can_send(void *opaque) -- 2.11.0