rename CONFIG_EPOLL_CREATE1 to CONFIG_EPOLL, and stop checking for epoll in meson.build
Since CONFIG_EPOLL is now unused, it's okay to perform this rename, to make it less ugly. Since epoll is linux-specific and is always present on linux, define CONFIG_EPOLL to 1 on linux, without compile-time test. Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Michael Tokarev committed
Jan 10, 2026 at 00:22 UTC
7cc61f922f4b5db006e8f03d61208a3d652ed2df
3 files changed
+4
-5
meson.build
+1
-2
@@ -2685,8 +2685,7 @@ config_host_data.set('CONFIG_INOTIFY1', have_inotify_init1)
2685
# has_header_symbol
2686
config_host_data.set('CONFIG_BLKZONED',
2687
cc.has_header_symbol('linux/blkzoned.h', 'BLKOPENZONE'))
2688
-config_host_data.set('CONFIG_EPOLL_CREATE1',
2689
- cc.has_header_symbol('sys/epoll.h', 'epoll_create1'))
2688
+config_host_data.set('CONFIG_EPOLL', host_os == 'linux')
2689
config_host_data.set('CONFIG_FALLOCATE_PUNCH_HOLE',
2690
cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_PUNCH_HOLE') and
2691
cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_KEEP_SIZE'))
util/aio-posix.h
+2
-2
@@ -52,7 +52,7 @@ extern const FDMonOps fdmon_poll_ops;
52
/* Switch back to poll(2). list_lock must be held. */
53
void fdmon_poll_downgrade(AioContext *ctx);
54
55
-#ifdef CONFIG_EPOLL_CREATE1
55
+#ifdef CONFIG_EPOLL
56
bool fdmon_epoll_try_upgrade(AioContext *ctx, unsigned npfd);
57
void fdmon_epoll_setup(AioContext *ctx);
58
@@ -71,7 +71,7 @@ static inline void fdmon_epoll_setup(AioContext *ctx)
71
static inline void fdmon_epoll_disable(AioContext *ctx)
72
{
73
}
74
-#endif /* !CONFIG_EPOLL_CREATE1 */
74
+#endif /* !CONFIG_EPOLL */
75
76
#ifdef CONFIG_LINUX_IO_URING
77
bool fdmon_io_uring_setup(AioContext *ctx, Error **errp);
util/meson.build
+1
-1
@@ -3,7 +3,7 @@ util_ss.add(files('thread-context.c'), numa)
3
if host_os != 'windows'
4
util_ss.add(files('aio-posix.c'))
5
util_ss.add(files('fdmon-poll.c'))
6
- if config_host_data.get('CONFIG_EPOLL_CREATE1')
6
+ if config_host_data.get('CONFIG_EPOLL')
7
util_ss.add(files('fdmon-epoll.c'))
8
endif
9
util_ss.add(files('compatfd.c'))