From: Li Qiang <liq3ea@gmail.com>
To: jasowang@redhat.com, mst@redhat.com
Cc: qemu-devel@nongnu.org, Li Qiang <liq3ea@gmail.com>
Subject: [Qemu-devel] [PATCH] net: tap: use qemu_set_nonblock
Date: Wed, 21 Nov 2018 03:21:59 -0800 [thread overview]
Message-ID: <1542799319-2595-1-git-send-email-liq3ea@gmail.com> (raw)
The fcntl will change the flags directly, use qemu_set_nonblock()
instead.
Signed-off-by: Li Qiang <liq3ea@gmail.com>
---
net/tap.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/tap.c b/net/tap.c
index cc8525f154..e8aadd8d4b 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -592,7 +592,7 @@ int net_init_bridge(const Netdev *netdev, const char *name,
return -1;
}
- fcntl(fd, F_SETFL, O_NONBLOCK);
+ qemu_set_nonblock(fd);
vnet_hdr = tap_probe_vnet_hdr(fd);
s = net_tap_fd_init(peer, "bridge", name, fd, vnet_hdr);
@@ -707,7 +707,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
}
return;
}
- fcntl(vhostfd, F_SETFL, O_NONBLOCK);
+ qemu_set_nonblock(vhostfd);
}
options.opaque = (void *)(uintptr_t)vhostfd;
@@ -791,7 +791,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
return -1;
}
- fcntl(fd, F_SETFL, O_NONBLOCK);
+ qemu_set_nonblock(fd);
vnet_hdr = tap_probe_vnet_hdr(fd);
@@ -839,7 +839,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
goto free_fail;
}
- fcntl(fd, F_SETFL, O_NONBLOCK);
+ qemu_set_nonblock(fd);
if (i == 0) {
vnet_hdr = tap_probe_vnet_hdr(fd);
@@ -887,7 +887,7 @@ free_fail:
return -1;
}
- fcntl(fd, F_SETFL, O_NONBLOCK);
+ qemu_set_nonblock(fd);
vnet_hdr = tap_probe_vnet_hdr(fd);
net_init_tap_one(tap, peer, "bridge", name, ifname,
--
2.11.0
next reply other threads:[~2018-11-21 11:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 11:21 Li Qiang [this message]
2018-11-21 11:28 ` [Qemu-devel] [PATCH] net: tap: use qemu_set_nonblock Marc-André Lureau
2018-11-21 11:34 ` Li Qiang
2018-11-21 11:57 ` Daniel P. Berrangé
2018-11-21 12:23 ` Michael S. Tsirkin
2018-11-21 14:21 ` Markus Armbruster
2018-11-21 17:30 ` Eric Blake
2018-11-21 17:39 ` Michael S. Tsirkin
2018-11-22 2:22 ` Jason Wang
2019-03-10 11:26 ` Li Qiang
2019-03-11 9:35 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1542799319-2595-1-git-send-email-liq3ea@gmail.com \
--to=liq3ea@gmail.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).