[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 07/14] virtio-net: first s/g is always at start
From: |
Anthony Liguori |
Subject: |
Re: [Qemu-devel] [PATCH 07/14] virtio-net: first s/g is always at start of buf |
Date: |
Mon, 24 Sep 2012 19:39:33 -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:
> We know offset is 0, assert that.
>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Anthony Liguori <address@hidden>
Regards,
Anthony Liguori
> ---
> hw/virtio-net.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/virtio-net.c b/hw/virtio-net.c
> index 3a0d1a7..6e6f5f3 100644
> --- a/hw/virtio-net.c
> +++ b/hw/virtio-net.c
> @@ -630,6 +630,7 @@ static ssize_t virtio_net_receive(NetClientState *nc,
> const uint8_t *buf, size_t
> }
>
> if (i == 0) {
> + assert(offset == 0);
> if (n->mergeable_rx_bufs) {
> mhdr_cnt = iov_cpy(mhdr_sg, ARRAY_SIZE(mhdr_sg),
> sg, elem.in_num,
> @@ -637,8 +638,8 @@ static ssize_t virtio_net_receive(NetClientState *nc,
> const uint8_t *buf, size_t
> sizeof(mhdr.num_buffers));
> }
>
> - receive_header(n, sg, elem.in_num, buf + offset, size - offset);
> - offset += n->host_hdr_len;
> + receive_header(n, sg, elem.in_num, buf, size);
> + offset = n->host_hdr_len;
> total += n->guest_hdr_len;
> guest_offset = n->guest_hdr_len;
> } else {
> --
> MST
- [Qemu-devel] [PATCH 01/14] virtio-net: track host/guest header length, (continued)
- [Qemu-devel] [PATCH 01/14] virtio-net: track host/guest header length, Michael S. Tsirkin, 2012/09/24
- [Qemu-devel] [PATCH 03/14] iov: add iov_cpy, Michael S. Tsirkin, 2012/09/24
- [Qemu-devel] [PATCH 04/14] virtio-net: avoid sg copy, Michael S. Tsirkin, 2012/09/24
- [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
- Re: [Qemu-devel] [PATCH 07/14] virtio-net: first s/g is always at start of buf,
Anthony Liguori <=
- [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
- [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