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 <michalis@unikraft.io>
Approved-by: Andrei Tatar <andrei@unikraft.io>
Reviewed-by: Sergiu Moga <sergiu@unikraft.io>
Reviewed-by: Andrei Tatar <andrei@unikraft.io>
GitHub-Closes: #1627

diff --git a/lib/posix-fdtab/Config.uk b/lib/posix-fdtab/Config.uk
index 49a806f7ae80e5072dea9da64a3b4c5218930eac..c430ccc30e9c40cfbd52235e3ed50567787cbf97 100644 (file)
--- 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 1349ce67ffddffed3319aff0c8d163e83d2acfbe..4df748bf0b03643294e77506913aaaaa86bb2828 100644 (file)
--- a/lib/posix-fdtab/fdtab.c
+++ b/lib/posix-fdtab/fdtab.c
@@ -28,9 +28,9 @@
 #include <uk/posix-fdtab-legacy.h>
 #endif /* CONFIG_LIBPOSIX_FDTAB_LEGACY_SHIM */
 
-#if CONFIG_LIBPOSIX_PROCESS_CLONE
+#if CONFIG_LIBPOSIX_PROCESS_MULTITHREADING
 #include <uk/process.h>
-#endif /* CONFIG_LIBPOSIX_PROCESS_CLONE */
+#endif /* CONFIG_LIBPOSIX_PROCESS_MULTITHREADING */
 
 #if CONFIG_LIBPOSIX_PROCESS_EXECVE
 #include <uk/event.h>
@@ -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 */