linux-user: Unconditionally use pipe2() syscall
PATCH 1/1 linux-user: Unconditionally use pipe2() syscall
The pipe2() syscall is available on all Linux platforms since kernel 2.6.27, so use it unconditionally to emulate pipe() and pipe2().
linux-user/syscall.c +1 -10
@@ -1586,21 +1586,12 @@ static abi_long do_ppoll(abi_long arg1, abi_long arg2, abi_long arg3, }#endif -static abi_long do_pipe2 (int host_pipe[],int flags) -{ -#ifdef CONFIG_PIPE2 -return pipe2 (host_pipe, flags); -#else -return -ENOSYS ; -#endif -} -static abi_long do_pipe (CPUArchState *cpu_env,abi_ulong pipedes,int flags,int is_pipe2) {int host_pipe[2 ];abi_long ret; - ret = is_pipe2 ?do_pipe2 (host_pipe, flags) :pipe (host_pipe); + ret =pipe2 (host_pipe, flags);if (is_error (ret))return get_errno (ret);
meson.build +0 -9
@@ -2026,15 +2026,6 @@ config_host_data.set('CONFIG_OPEN_BY_HANDLE', cc.links(gnu_source_prefix + ''' #else int main(void) { struct file_handle fh; return open_by_handle_at(0, &fh, 0); } #endif''')) -config_host_data.set('CONFIG_PIPE2', cc.links(gnu_source_prefix + ''' - #include <unistd.h> - #include <fcntl.h> - - int main(void) - { - int pipefd[2]; - return pipe2(pipefd, O_CLOEXEC); - }''')) config_host_data.set('CONFIG_POSIX_MADVISE', cc.links(gnu_source_prefix + ''' #include <sys/mman.h> #include <stddef.h>
Quoted 6 lines · Helge Deller
The
pipe2()syscall is available on all Linux platforms since kernel 2.6.27, so use it unconditionally to emulatepipe()andpipe2().Signed-off-by Helge Deller <[email protected]>
thanks
-- PMM
Le 18/07/2022 à 18:34, Helge Deller a écrit :
Quoted 18 lines
The
pipe2()syscall is available on all Linux platforms since kernel 2.6.27, so use it unconditionally to emulatepipe()andpipe2().Signed-off-by Helge Deller <[email protected]>linux-user/syscall.c +0
-5@@ -1586,21 +1586,12 @@ static abi_long do_ppoll(abi_long arg1, abi_long arg2, abi_long arg3, }#endif -static abi_long do_pipe2 (int host_pipe[],int flags) -{ -#ifdef CONFIG_PIPE2 -return pipe2 (host_pipe, flags); -#else
linux-user/syscall.c static abi_long do_ppoll(abi_long arg1, abi_long arg2, abi_long arg3, · line 1603
Quoted 10 lines
linux-user/syscall.c +0
-5-return -ENOSYS ; -#endif -} -static abi_long do_pipe (CPUArchState *cpu_env,abi_ulong pipedes,int flags,int is_pipe2) {int host_pipe[2 ];abi_long ret; - ret = is_pipe2 ?do_pipe2 (host_pipe, flags) :pipe (host_pipe);
It doesn't apply cleanly:
It seems this patch is applied on top of the one you want to replace (is_pipe2 rather than flags).
Thanks,
Laurent