From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58564)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <hongyang.yang@easystack.cn>) id 1bAFI9-0006aG-DU
	for qemu-devel@nongnu.org; Tue, 07 Jun 2016 07:35:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <hongyang.yang@easystack.cn>) id 1bAFI3-0008Ts-2p
	for qemu-devel@nongnu.org; Tue, 07 Jun 2016 07:35:28 -0400
Received: from m199-177.yeah.net ([123.58.177.199]:23852)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <hongyang.yang@easystack.cn>) id 1bAFI1-0008T1-RJ
	for qemu-devel@nongnu.org; Tue, 07 Jun 2016 07:35:23 -0400
MIME-Version: 1.0
In-Reply-To: <1465285064-24833-1-git-send-email-pl@kamp.de>
References: <1465285064-24833-1-git-send-email-pl@kamp.de>
From: Yang Hongyang <hongyang.yang@easystack.cn>
Date: Tue, 7 Jun 2016 19:35:00 +0800
Message-ID: <CAN+wFuK1dd-hq4Pq_n4+DQ1evDP_xaRhRAKX_CTKdLONeWRRFA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PATCH] net: fix qemu_announce_self not emitting
 packets
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: Peter Lieven <pl@kamp.de>
Cc: qemu devel <qemu-devel@nongnu.org>, Jason Wang <jasowang@redhat.com>, Yang Hongyang <yanghy@cn.fujitsu.com>, qemu-stable@nongnu.org, s.priebe@profihost.ag

Hi Peter,

Sorry for the inconvenience and thank you for the patch.

On Tue, Jun 7, 2016 at 3:37 PM, Peter Lieven <pl@kamp.de> wrote:

> commit fefe2a78 accidently dropped the code path for injecting
> raw packets. This feature is needed for sending gratuitous ARPs
> after an incoming migration has completed. The result is increased
> network downtime for vservers where the network card is not virtio-net
> with the VIRTIO_NET_F_GUEST_ANNOUNCE feature.
>
> Fixes: fefe2a78abde932e0f340b21bded2c86def1d242
> Cc: qemu-stable@nongnu.org
> Cc: yanghy@cn.fujitsu.com
> Signed-off-by: Peter Lieven <pl@kamp.de>
>

After addressing Paolo's comments
Reviewed-by: Yang Hongyang <hongyang.yang@easystack.cn>


> ---
>  net/net.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/net/net.c b/net/net.c
> index 5f3e5a9..d5834ea 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -722,7 +722,11 @@ ssize_t qemu_deliver_packet_iov(NetClientState
> *sender,
>          return 0;
>      }
>
> -    if (nc->info->receive_iov) {
> +    if (flags & QEMU_NET_PACKET_FLAG_RAW && iovcnt == 1 &&
> +        nc->info->receive_raw) {
> +        /* this is required for qemu_announce_self() */
> +        ret = nc->info->receive_raw(nc, iov[0].iov_base, iov[0].iov_len);
> +    } else  if (nc->info->receive_iov) {
>          ret = nc->info->receive_iov(nc, iov, iovcnt);
>      } else {
>          ret = nc_sendv_compat(nc, iov, iovcnt, flags);
> --
> 1.9.1
>
>
>


-- 
Thanks,
Yang