From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsDJk-0005HI-Sn for qemu-devel@nongnu.org; Mon, 07 Jan 2013 09:04:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsDJf-0005pN-EK for qemu-devel@nongnu.org; Mon, 07 Jan 2013 09:04:44 -0500 Received: from mail-bk0-f49.google.com ([209.85.214.49]:34688) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsDJf-0005nW-7I for qemu-devel@nongnu.org; Mon, 07 Jan 2013 09:04:39 -0500 Received: by mail-bk0-f49.google.com with SMTP id jm19so8410403bkc.8 for ; Mon, 07 Jan 2013 06:04:38 -0800 (PST) Date: Mon, 7 Jan 2013 15:04:35 +0100 From: Stefan Hajnoczi Message-ID: <20130107140435.GA18749@stefanha-thinkpad.redhat.com> References: <1354878909-21369-1-git-send-email-dmitry@daynix.com> <1354878909-21369-3-git-send-email-dmitry@daynix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1354878909-21369-3-git-send-email-dmitry@daynix.com> Subject: Re: [Qemu-devel] [PATCH V8 2/5] Adding utility function net_checksum_add_iov() for iovec checksum calculation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Dmitry Fleytman Cc: Yan Vugenfirer , Gerhard Wiesinger , qemu-devel@nongnu.org, Anthony Liguori , Paolo Bonzini On Fri, Dec 07, 2012 at 01:15:06PM +0200, Dmitry Fleytman wrote: > Signed-off-by: Dmitry Fleytman > Signed-off-by: Yan Vugenfirer > --- > iov.h | 5 +++++ > net/checksum.c | 28 ++++++++++++++++++++++++++++ > net/checksum.h | 8 ++++++++ > 3 files changed, 41 insertions(+) > > diff --git a/iov.h b/iov.h > index 34c8ec9..c184a80 100644 > --- a/iov.h > +++ b/iov.h > @@ -11,6 +11,9 @@ This file has been moved in qemu.git/master. It is now include/qemu/iov.h. > * the COPYING file in the top-level directory. > */ > > +#ifndef QEMU_IOV_H > +#define QEMU_IOV_H > + This is already present in qemu.git/master. > #include "qemu-common.h" > > /** > @@ -95,3 +98,5 @@ void iov_hexdump(const struct iovec *iov, const unsigned int iov_cnt, > unsigned iov_copy(struct iovec *dst_iov, unsigned int dst_iov_cnt, > const struct iovec *iov, unsigned int iov_cnt, > size_t offset, size_t bytes); > + > +#endif /* QEMU_IOV_H */ Same here. Just pointing out expected rebase conflicts you'll see for the next revision of this series. > diff --git a/net/checksum.c b/net/checksum.c > index 4fa5563..9c813ff 100644 > --- a/net/checksum.c > +++ b/net/checksum.c > @@ -84,3 +84,31 @@ void net_checksum_calculate(uint8_t *data, int length) > data[14+hlen+csum_offset] = csum >> 8; > data[14+hlen+csum_offset+1] = csum & 0xff; > } > + > +uint32_t > +net_checksum_add_iov(const struct iovec *iov, const unsigned int iov_cnt, > + uint32_t iov_off, uint32_t size) > +{ > + size_t iovec_off, buf_off; > + unsigned int i; > + uint32_t res = 0; > + uint32_t seq = 0; > + > + iovec_off = 0; > + buf_off = 0; > + for (i = 0; i < iov_cnt && size; i++) { > + if (iov_off < (iovec_off + iov[i].iov_len)) { > + size_t len = MIN((iovec_off + iov[i].iov_len) - iov_off , size); > + void *chunk_buf = iov[i].iov_base + (iov_off - iovec_off); > + > + res += net_checksum_add_cont(len, chunk_buf, seq); > + seq += len; > + > + buf_off += len; > + iov_off += len; > + size -= len; > + } > + iovec_off += iov[i].iov_len; > + } > + return res; > +} > diff --git a/net/checksum.h b/net/checksum.h > index 171924c..e63c482 100644 > --- a/net/checksum.h > +++ b/net/checksum.h > @@ -19,6 +19,7 @@ > #define QEMU_NET_CHECKSUM_H > > #include > +#include "iov.h" iov.h is the wrong header file, you need struct iovec from qemu-common.h.