summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Lieven <pl@kamp.de>2016-06-09 11:39:27 +0200
committerJason Wang <jasowang@redhat.com>2016-06-28 10:13:57 +0800
commitca1ee3d6b546e841a1b9db413eb8fa09f13a061b (patch)
tree87c215f2ccf6aa6d446b78ad37ac3a403cc40df7
parent14e60aaece20a1cfc059a69f6491b0899f9257a8 (diff)
downloadqemu-ca1ee3d6b546e841a1b9db413eb8fa09f13a061b.tar.gz
qemu-ca1ee3d6b546e841a1b9db413eb8fa09f13a061b.tar.bz2
qemu-ca1ee3d6b546e841a1b9db413eb8fa09f13a061b.zip
net: fix qemu_announce_self not emitting packets
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 <pl@kamp.de> Signed-off-by: Jason Wang <jasowang@redhat.com>
-rw-r--r--net/net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/net.c b/net/net.c
index 5f3e5a9ff5..75bb1770f9 100644
--- a/net/net.c
+++ b/net/net.c
@@ -722,7 +722,7 @@ ssize_t qemu_deliver_packet_iov(NetClientState *sender,
return 0;
}
- if (nc->info->receive_iov) {
+ if (nc->info->receive_iov && !(flags & QEMU_NET_PACKET_FLAG_RAW)) {
ret = nc->info->receive_iov(nc, iov, iovcnt);
} else {
ret = nc_sendv_compat(nc, iov, iovcnt, flags);