From patchwork Thu Oct 22 16:43:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [03/19] net: make tap_receive() re-use tap_receive_iov() code Date: Thu, 22 Oct 2009 06:43:34 -0000 From: Mark McLoughlin X-Patchwork-Id: 36708 Message-Id: <1256229830-28066-4-git-send-email-markmc@redhat.com> To: qemu-devel@nongnu.org Cc: Mark McLoughlin 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 --- net.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/net.c b/net.c index 0e3388b..728941a 100644 --- a/net.c +++ b/net.c @@ -1291,10 +1291,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 { @@ -1309,16 +1307,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)