aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorBrijesh Singh <brijesh.singh@amd.com>2018-04-06 13:51:25 -0500
committerJason Wang <jasowang@redhat.com>2018-06-15 10:39:53 +0800
commitd542800d1edc62f63f8a29cfa6bdd1a9536ae11c (patch)
treed77cc3daa8b3899bcf2aac17576d459eb7df231a /net
parent409c241f887a38bb7a2ac12e34d3a8d73922a9a5 (diff)
downloadqemu-d542800d1edc62f63f8a29cfa6bdd1a9536ae11c.zip
qemu-d542800d1edc62f63f8a29cfa6bdd1a9536ae11c.tar.gz
qemu-d542800d1edc62f63f8a29cfa6bdd1a9536ae11c.tar.bz2
tap: set vhostfd passed from qemu cli to non-blocking
A guest boot hangs while probing the network interface when iommu_platform=on is used. The following qemu cli hangs without this patch: # $QEMU \ -netdev tap,fd=3,id=hostnet0,vhost=on,vhostfd=4 3<>/dev/tap67 4<>/dev/host-net \ -device virtio-net-pci,netdev=hostnet0,id=net0,iommu_platform=on,disable-legacy=on \ ... Commit: c471ad0e9bd46 (vhost_net: device IOTLB support) took care of setting vhostfd to non-blocking when QEMU opens /dev/host-net but if the fd is passed from qemu cli then we need to ensure that fd is set to non-blocking. Fixes: c471ad0e9bd46 ("vhost_net: device IOTLB support") Cc: qemu-stable@nongnu.org Cc: Michael S. Tsirkin <mst@redhat.com> Cc: Jason Wang <jasowang@redhat.com> Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/tap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tap.c b/net/tap.c
index de05f20..2126f48 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -40,6 +40,7 @@
#include "qemu-common.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
+#include "qemu/sockets.h"
#include "net/tap.h"
@@ -693,6 +694,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
}
return;
}
+ qemu_set_nonblock(vhostfd);
} else {
vhostfd = open("/dev/vhost-net", O_RDWR);
if (vhostfd < 0) {