From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGJBC-0005Dk-Mt for qemu-devel@nongnu.org; Mon, 24 Sep 2012 20:39:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGJBB-0004oC-NI for qemu-devel@nongnu.org; Mon, 24 Sep 2012 20:39:14 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:38763) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGJBB-0004o3-I8 for qemu-devel@nongnu.org; Mon, 24 Sep 2012 20:39:13 -0400 Received: by obbta14 with SMTP id ta14so5652814obb.4 for ; Mon, 24 Sep 2012 17:39:13 -0700 (PDT) From: Anthony Liguori In-Reply-To: References: Date: Mon, 24 Sep 2012 19:39:09 -0500 Message-ID: <874nmn0wcy.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH 06/14] virtio-net: refactor receive_hdr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" , qemu-devel@nongnu.org, Jason Wang , stefanha@linux.vnet.ibm.com, aurelien@aurel32.net "Michael S. Tsirkin" 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 Reviewed-by: Anthony Liguori 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