aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2022-03-29 15:25:05 +0400
committerMarc-André Lureau <marcandre.lureau@redhat.com>2022-05-03 15:17:30 +0400
commit4d14cb0cd7868d11091acf5c930982cae4e3489c (patch)
treeb04526babcdc90caa67d374211e71dc0389187de /util
parentc6d3bcb4b91e9ebf08f3afb8759760a9dbb2b744 (diff)
downloadqemu-4d14cb0cd7868d11091acf5c930982cae4e3489c.zip
qemu-4d14cb0cd7868d11091acf5c930982cae4e3489c.tar.gz
qemu-4d14cb0cd7868d11091acf5c930982cae4e3489c.tar.bz2
Use g_unix_set_fd_nonblocking()
API available since glib 2.30. It also preserves errno. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'util')
-rw-r--r--util/event_notifier-posix.c6
-rw-r--r--util/main-loop.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
index 8dc30c5..2aa14ea 100644
--- a/util/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
@@ -52,13 +52,11 @@ int event_notifier_init(EventNotifier *e, int active)
if (qemu_pipe(fds) < 0) {
return -errno;
}
- ret = fcntl_setfl(fds[0], O_NONBLOCK);
- if (ret < 0) {
+ if (!g_unix_set_fd_nonblocking(fds[0], true, NULL)) {
ret = -errno;
goto fail;
}
- ret = fcntl_setfl(fds[1], O_NONBLOCK);
- if (ret < 0) {
+ if (!g_unix_set_fd_nonblocking(fds[1], true, NULL)) {
ret = -errno;
goto fail;
}
diff --git a/util/main-loop.c b/util/main-loop.c
index b7b0ce4..9afac10 100644
--- a/util/main-loop.c
+++ b/util/main-loop.c
@@ -114,7 +114,7 @@ static int qemu_signal_init(Error **errp)
return -errno;
}
- fcntl_setfl(sigfd, O_NONBLOCK);
+ g_unix_set_fd_nonblocking(sigfd, true, NULL);
qemu_set_fd_handler(sigfd, sigfd_handler, NULL, (void *)(intptr_t)sigfd);