From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bABab-0000O3-Ie for qemu-devel@nongnu.org; Tue, 07 Jun 2016 03:38:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bABaP-0002JP-Rh for qemu-devel@nongnu.org; Tue, 07 Jun 2016 03:38:16 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:54919 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bABaP-0002It-Hy for qemu-devel@nongnu.org; Tue, 07 Jun 2016 03:38:05 -0400 From: Peter Lieven Date: Tue, 7 Jun 2016 09:37:44 +0200 Message-Id: <1465285064-24833-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH] net: fix qemu_announce_self not emitting packets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, s.priebe@profihost.ag, Peter Lieven , qemu-stable@nongnu.org, yanghy@cn.fujitsu.com 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); + } 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