From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCI3L-00049h-SD for qemu-devel@nongnu.org; Sun, 12 Jun 2016 22:56:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCI3G-0000Gj-KL for qemu-devel@nongnu.org; Sun, 12 Jun 2016 22:56:39 -0400 References: <1465465167-4698-1-git-send-email-pl@kamp.de> From: Jason Wang Message-ID: <575E20D2.30406@redhat.com> Date: Mon, 13 Jun 2016 10:56:18 +0800 MIME-Version: 1.0 In-Reply-To: <1465465167-4698-1-git-send-email-pl@kamp.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH V3] net: fix qemu_announce_self not emitting packets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Lieven , qemu-devel@nongnu.org Cc: s.priebe@profihost.ag, pbonzini@redhat.com, qemu-stable@nongnu.org, hongyang.yang@easystack.cn On 2016=E5=B9=B406=E6=9C=8809=E6=97=A5 17:39, Peter Lieven 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: hongyang.yang@easystack.cn > Signed-off-by: Peter Lieven > --- > v1->v2: assert that only raw packets with a plain buffer come in. [Paol= o] > v2->v3: nc_senv_compat can take care of raw packets [Paolo, Jason] > > net/net.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/net.c b/net/net.c > index 5f3e5a9..75bb177 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -722,7 +722,7 @@ ssize_t qemu_deliver_packet_iov(NetClientState *sen= der, > return 0; > } > =20 > - if (nc->info->receive_iov) { > + if (nc->info->receive_iov && !(flags & QEMU_NET_PACKET_FLAG_RAW)) = { > ret =3D nc->info->receive_iov(nc, iov, iovcnt); > } else { > ret =3D nc_sendv_compat(nc, iov, iovcnt, flags); Applied to -net. Thanks