From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAByY-0002rV-Gk for qemu-devel@nongnu.org; Tue, 07 Jun 2016 04:03:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAByU-0008Bf-B1 for qemu-devel@nongnu.org; Tue, 07 Jun 2016 04:03:02 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:54909 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAByU-0008B8-1d for qemu-devel@nongnu.org; Tue, 07 Jun 2016 04:02:58 -0400 References: <1465285064-24833-1-git-send-email-pl@kamp.de> <7de3033e-327a-ee68-cd83-9f5688c78f8c@redhat.com> From: Peter Lieven Message-ID: <57567FAD.803@kamp.de> Date: Tue, 7 Jun 2016 10:02:53 +0200 MIME-Version: 1.0 In-Reply-To: <7de3033e-327a-ee68-cd83-9f5688c78f8c@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] net: fix qemu_announce_self not emitting packets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Cc: jasowang@redhat.com, yanghy@cn.fujitsu.com, qemu-stable@nongnu.org, s.priebe@profihost.ag Am 07.06.2016 um 09:55 schrieb Paolo Bonzini: > > On 07/06/2016 09:37, 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: yanghy@cn.fujitsu.com >> Signed-off-by: Peter Lieven >> --- >> 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); > Possibly move "iovcnt == 1" from the if condition to an assertion inside it? I do not know if there is any other user that emits raw packets than qemu_announce_self. The question is do you want to abort or just return -1 (which is the case without this patch). Peter