From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57753)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZoAR6-0003gl-Sp
	for qemu-devel@nongnu.org; Mon, 19 Oct 2015 09:25:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZoAR3-0003Wt-O5
	for qemu-devel@nongnu.org; Mon, 19 Oct 2015 09:25:12 -0400
Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]:37573)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZoAR3-0003WK-Hy
	for qemu-devel@nongnu.org; Mon, 19 Oct 2015 09:25:09 -0400
Received: by wicfv8 with SMTP id fv8so5738395wic.0
	for <qemu-devel@nongnu.org>; Mon, 19 Oct 2015 06:25:08 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
References: <1444637836-12215-1-git-send-email-jasowang@redhat.com>
	<1444637836-12215-9-git-send-email-jasowang@redhat.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <5624EF32.5010508@redhat.com>
Date: Mon, 19 Oct 2015 15:25:06 +0200
MIME-Version: 1.0
In-Reply-To: <1444637836-12215-9-git-send-email-jasowang@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PULL 08/14] net: merge qemu_deliver_packet and
 qemu_deliver_packet_iov
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Jason Wang <jasowang@redhat.com>, qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: Yang Hongyang <yanghy@cn.fujitsu.com>



On 12/10/2015 10:17, Jason Wang wrote:
>  static ssize_t nc_sendv_compat(NetClientState *nc, const struct iovec *iov,
> -                               int iovcnt)
> +                               int iovcnt, unsigned flags)
>  {
> -    uint8_t buffer[NET_BUFSIZE];
> +    uint8_t buf[NET_BUFSIZE];
> +    uint8_t *buffer;
>      size_t offset;
>  
> -    offset = iov_to_buf(iov, iovcnt, 0, buffer, sizeof(buffer));
> +    if (iovcnt == 1) {
> +        buffer = iov[0].iov_base;
> +        offset = iov[0].iov_len;
> +    } else {
> +        buffer = buf;
> +        offset = iov_to_buf(iov, iovcnt, 0, buffer, sizeof(buffer));

You want "buf, sizeof(buf)" here.  sizeof(buffer) is the size of a
pointer, which is wrong.

Jason, can you please fix this?

Paolo

> +    }