[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 06/14] virtio-net: refactor receive_hdr
From: |
Anthony Liguori |
Subject: |
Re: [Qemu-devel] [PATCH 06/14] virtio-net: refactor receive_hdr |
Date: |
Mon, 24 Sep 2012 19:39:09 -0500 |
User-agent: |
Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) |
"Michael S. Tsirkin" <address@hidden> writes:
> 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>
Reviewed-by: Anthony Liguori <address@hidden>
Regards,
Anthony Liguori
> ---
> 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 9611d95..3a0d1a7 100644
> --- a/hw/virtio-net.c
> +++ b/hw/virtio-net.c
> @@ -517,15 +517,13 @@ static void work_around_broken_dhclient(const 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) {
> - work_around_broken_dhclient(buf, buf + offset, size - offset);
> - offset = sizeof(struct virtio_net_hdr);
> - iov_from_buf(iov, iov_cnt, 0, buf, offset);
> + work_around_broken_dhclient(buf, buf + 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,
> @@ -533,8 +531,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)
> @@ -641,8 +637,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
- Re: [Qemu-devel] [PATCH 04/14] virtio-net: avoid sg copy, (continued)
- [Qemu-devel] [PATCH 05/14] virtio-net: use safe iov operations for rx, Michael S. Tsirkin, 2012/09/24
- [Qemu-devel] [PATCH 07/14] virtio-net: first s/g is always at start of buf, Michael S. Tsirkin, 2012/09/24
- [Qemu-devel] [PATCH 02/14] iov: add const annotation, Michael S. Tsirkin, 2012/09/24
- [Qemu-devel] [PATCH 08/14] virtio-net: switch tx to safe iov functions, Michael S. Tsirkin, 2012/09/24
- [Qemu-devel] [PATCH 09/14] virtio-net: simplify rx code, Michael S. Tsirkin, 2012/09/24
- [Qemu-devel] [PATCH 06/14] virtio-net: refactor receive_hdr, Michael S. Tsirkin, 2012/09/24
- Re: [Qemu-devel] [PATCH 06/14] virtio-net: refactor receive_hdr,
Anthony Liguori <=
- [Qemu-devel] [PATCH 10/14] virtio: don't mark unaccessed memory as dirty, Michael S. Tsirkin, 2012/09/24
- [Qemu-devel] [PATCH 11/14] virtio-net: fix used len for tx, Michael S. Tsirkin, 2012/09/24
- [Qemu-devel] [PATCH 12/14] virtio-net: minor code simplification, Michael S. Tsirkin, 2012/09/24
- [Qemu-devel] [PATCH 14/14] virtio-net: enable mrg buf header in tap on linux, Michael S. Tsirkin, 2012/09/24
- [Qemu-devel] [PATCH 13/14] virtio-net: test peer header support at init time, Michael S. Tsirkin, 2012/09/24