From: Michalis Pappas Date: Tue, 1 Apr 2025 15:29:39 +0000 (+0200) Subject: lib/posix-fdtab: Adapt to updated libposix-process config options X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6673a86b99aafffe1ef0fa8c2eaed961cc0e9e23;p=unikraft%2Funikraft.git lib/posix-fdtab: Adapt to updated libposix-process config options Following the consolidation of CONFIG_LIBPOSIX_PROCESS_PIDS and CONFIG_LIBPOSIX_PROCESS_CLONE into LIBPOSIX_PROCESS_MULTITHREADING, update to the new config. Signed-off-by: Michalis Pappas Approved-by: Andrei Tatar Reviewed-by: Sergiu Moga Reviewed-by: Andrei Tatar GitHub-Closes: #1627 --- diff --git a/lib/posix-fdtab/Config.uk b/lib/posix-fdtab/Config.uk index 49a806f7a..c430ccc30 100644 --- a/lib/posix-fdtab/Config.uk +++ b/lib/posix-fdtab/Config.uk @@ -13,7 +13,7 @@ if LIBPOSIX_FDTAB # Hidden, will autoselect when required config LIBPOSIX_FDTAB_MULTITAB bool - default y if LIBPOSIX_PROCESS_CLONE + default y if LIBPOSIX_PROCESS_MULTITHREADING select LIBUKSCHED # Hidden, selected by core components when needed diff --git a/lib/posix-fdtab/fdtab.c b/lib/posix-fdtab/fdtab.c index 1349ce67f..4df748bf0 100644 --- a/lib/posix-fdtab/fdtab.c +++ b/lib/posix-fdtab/fdtab.c @@ -28,9 +28,9 @@ #include #endif /* CONFIG_LIBPOSIX_FDTAB_LEGACY_SHIM */ -#if CONFIG_LIBPOSIX_PROCESS_CLONE +#if CONFIG_LIBPOSIX_PROCESS_MULTITHREADING #include -#endif /* CONFIG_LIBPOSIX_PROCESS_CLONE */ +#endif /* CONFIG_LIBPOSIX_PROCESS_MULTITHREADING */ #if CONFIG_LIBPOSIX_PROCESS_EXECVE #include @@ -475,7 +475,7 @@ static void fdtab_thread_term(struct uk_thread *child) UK_THREAD_INIT(fdtab_thread_init, fdtab_thread_term); -#if CONFIG_LIBPOSIX_PROCESS_CLONE +#if CONFIG_LIBPOSIX_PROCESS_MULTITHREADING static int fdtab_clone(const struct clone_args *cl_args, size_t cl_args_len __unused, struct uk_thread *child, @@ -512,7 +512,7 @@ static int fdtab_clone(const struct clone_args *cl_args, UK_POSIX_CLONE_HANDLER(CLONE_FILES, 0, fdtab_clone, 0); -#endif /* CONFIG_LIBPOSIX_PROCESS_CLONE */ +#endif /* CONFIG_LIBPOSIX_PROCESS_MULTITHREADING */ #endif /* CONFIG_LIBPOSIX_FDTAB_MULTITAB */ /* Init fdtab as early as possible, to enable functions that rely on fds */