lib/vfscore: 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/vfscore/fd.c b/lib/vfscore/fd.c
index 52e8c3110b71ad3d125492e8f487cae9ff93e56d..9eb7f544df13380cc28ce514edf4fbc7aa2934c0 100644 (file)
--- a/lib/vfscore/fd.c
+++ b/lib/vfscore/fd.c
@@ -39,9 +39,9 @@
 #include <vfscore/file.h>
 #include <uk/plat/lcpu.h>
 #include <errno.h>
-#if CONFIG_LIBPOSIX_PROCESS_CLONE
+#if CONFIG_LIBPOSIX_PROCESS_MULTITHREADING
 #include <uk/process.h>
-#endif /* CONFIG_LIBPOSIX_PROCESS_CLONE */
+#endif /* CONFIG_LIBPOSIX_PROCESS_MULTITHREADING */
 
 #include <uk/posix-fdtab-legacy.h>
 
@@ -73,7 +73,7 @@ int fdalloc(struct vfscore_file *fp, int *newfd)
        return 0;
 }
 
-#if CONFIG_LIBPOSIX_PROCESS_CLONE
+#if CONFIG_LIBPOSIX_PROCESS_MULTITHREADING
 static int uk_posix_clone_files(const struct clone_args *cl_args,
                                size_t cl_args_len __unused,
                                struct uk_thread *child __unused,
@@ -91,4 +91,4 @@ static int uk_posix_clone_files(const struct clone_args *cl_args,
        return 0;
 }
 UK_POSIX_CLONE_HANDLER(CLONE_FILES, false, uk_posix_clone_files, 0x0);
-#endif /* CONFIG_LIBPOSIX_PROCESS_CLONE */
+#endif /* CONFIG_LIBPOSIX_PROCESS_MULTITHREADING */

diff --git a/lib/vfscore/syscalls.c b/lib/vfscore/syscalls.c
index 76f000d8c95bbbdf8e4d073854d7ca10ec5eb042..798aeac15e6ae29b6b6e502e8df7a3224d1336c7 100644 (file)
--- a/lib/vfscore/syscalls.c
+++ b/lib/vfscore/syscalls.c
@@ -46,9 +46,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#if CONFIG_LIBPOSIX_PROCESS_CLONE
+#if CONFIG_LIBPOSIX_PROCESS_MULTITHREADING
 #include <uk/process.h>
-#endif /* CONFIG_LIBPOSIX_PROCESS_CLONE */
+#endif /* CONFIG_LIBPOSIX_PROCESS_MULTITHREADING */
 
 #include <dirent.h>
 #include <vfscore/prex.h>
@@ -1233,7 +1233,7 @@ sys_fchdir(struct vfscore_file *fp, char *cwd)
        return 0;
 }
 
-#if CONFIG_LIBPOSIX_PROCESS_CLONE
+#if CONFIG_LIBPOSIX_PROCESS_MULTITHREADING
 static int uk_posix_clone_fs(const struct clone_args *cl_args,
                             size_t cl_args_len __unused,
                             struct uk_thread *child __unused,
@@ -1252,7 +1252,7 @@ static int uk_posix_clone_fs(const struct clone_args *cl_args,
        return 0;
 }
 UK_POSIX_CLONE_HANDLER(CLONE_FS, false, uk_posix_clone_fs, 0x0);
-#endif /* CONFIG_LIBPOSIX_PROCESS_CLONE */
+#endif /* CONFIG_LIBPOSIX_PROCESS_MULTITHREADING */
 
 int
 sys_readlink(char *path, char *buf, size_t bufsize, ssize_t *size)