[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv2 06/14] virtio-net: refactor receive_hdr
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCHv2 06/14] virtio-net: refactor receive_hdr |
Date: |
Tue, 25 Sep 2012 13:12:26 +0200 |
Now that we know host hdr length, we don't need to
duplicate the logic in receive_hdr: caller can
figure out the offset itself.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio-net.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index 883d381..fde2322 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -516,17 +516,15 @@ static void work_around_broken_dhclient(struct
virtio_net_hdr *hdr,
}
}
-static int receive_header(VirtIONet *n, const struct iovec *iov, int iov_cnt,
- const void *buf, size_t size)
+static void receive_header(VirtIONet *n, const struct iovec *iov, int iov_cnt,
+ const void *buf, size_t size)
{
- int offset = 0;
-
if (n->has_vnet_hdr) {
/* FIXME this cast is evil */
void *wbuf = (void *)buf;
- work_around_broken_dhclient(wbuf, wbuf + offset, size - offset);
- offset = sizeof(struct virtio_net_hdr);
- iov_from_buf(iov, iov_cnt, 0, buf, offset);
+ work_around_broken_dhclient(wbuf, wbuf + n->host_hdr_len,
+ size - n->host_hdr_len);
+ iov_from_buf(iov, iov_cnt, 0, buf, sizeof(struct virtio_net_hdr));
} else {
struct virtio_net_hdr hdr = {
.flags = 0,
@@ -534,8 +532,6 @@ static int receive_header(VirtIONet *n, const struct iovec
*iov, int iov_cnt,
};
iov_from_buf(iov, iov_cnt, 0, &hdr, sizeof hdr);
}
-
- return offset;
}
static int receive_filter(VirtIONet *n, const uint8_t *buf, int size)
@@ -642,8 +638,8 @@ static ssize_t virtio_net_receive(NetClientState *nc, const
uint8_t *buf, size_t
sizeof(mhdr.num_buffers));
}
- offset += receive_header(n, sg, elem.in_num,
- buf + offset, size - offset);
+ receive_header(n, sg, elem.in_num, buf + offset, size - offset);
+ offset += n->host_hdr_len;
total += n->guest_hdr_len;
guest_offset = n->guest_hdr_len;
} else {
--
MST
- [Qemu-devel] [PATCHv2 00/14] virtio-net: iovec handling cleanup, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 01/14] virtio-net: track host/guest header length, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 04/14] virtio-net: avoid sg copy, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 02/14] iov: add const annotation, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 03/14] iov: add iov_cpy, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 06/14] virtio-net: refactor receive_hdr,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCHv2 05/14] virtio-net: use safe iov operations for rx, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 07/14] virtio-net: first s/g is always at start of buf, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 08/14] virtio-net: switch tx to safe iov functions, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 09/14] virtio-net: simplify rx code, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 12/14] virtio-net: minor code simplification, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 14/14] virtio-net: enable mrg buf header in tap on linux, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 10/14] virtio: don't mark unaccessed memory as dirty, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 11/14] virtio-net: fix used len for tx, Michael S. Tsirkin, 2012/09/25
- [Qemu-devel] [PATCHv2 13/14] virtio-net: test peer header support at init time, Michael S. Tsirkin, 2012/09/25