On 11.03.2026 15:40, Michael Tokarev wrote:
the only place in qemu which used the check for inotify_init()
was linux-user, which now assumes inotify_init() is always
present. There's no need to check for this function anymore.
Signed-off-by: Michael Tokarev <[email protected]>
---
This is on top of:
https://lore.kernel.org/qemu-trivial/[email protected]/T/#u
which gets rid of usage of CONFIG_INOTIFY from linux-user/.
meson.build | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 5143639a19..a513d3eb3a 100644
--- a/meson.build
+++ b/meson.build
@@ -2675,15 +2675,12 @@ endif
config_host_data.set('CONFIG_ASAN_IFACE_FIBER', have_asan_fiber)
inotify = not_found
-have_inotify_init = cc.has_header_symbol('sys/inotify.h', 'inotify_init')
have_inotify_init1 = cc.has_header_symbol('sys/inotify.h', 'inotify_init1')
-if (have_inotify_init or have_inotify_init1) and not
cc.has_function('inotify_init1')
+if have_inotify_init1 and not cc.has_function('inotify_init1')
# FreeBSD 14 and older need libinotify-kqueue wrapper
inotify = cc.find_library('inotify')
- have_inotify_init = have_inotify_init and inotify.found()
have_inotify_init1 = have_inotify_init1 and inotify.found()
This should be simplified further as
have_inotify_init1 = inotify.found()
though I'm not sure how it's possible to have inotify_init1 symbol in
header but not in some library - either libc or libinotify. Maybe this
whole if..endif can be simplified further.
endif
Thanks,
/mjt
