| Message ID | 1480003738-8754-3-git-send-email-Lena.Djokic@rt-rk.com |
|---|---|
| State | New |
| Headers | show |
On 24 November 2016 at 16:08, Lena Djokic <Lena.Djokic@rt-rk.com> wrote: > This commit adds necessary conversion of argument passed to inotify_init1. > inotify_init1 flags can be IN_NONBLOCK and IN_CLOEXEC which rely on O_NONBLOCK > and O_CLOEXEC and those can have different values on different platforms. > > Signed-off-by: Lena Djokic <Lena.Djokic@rt-rk.com> > --- > linux-user/syscall.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index f5d9a26..41873ca 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -11625,7 +11625,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, > #ifdef CONFIG_INOTIFY1 > #if defined(TARGET_NR_inotify_init1) && defined(__NR_inotify_init1) > case TARGET_NR_inotify_init1: > - ret = get_errno(sys_inotify_init1(arg1)); > + ret = get_errno(sys_inotify_init1(target_to_host_bitmask(arg1, > + fcntl_flags_tbl))); > break; > #endif > #endif Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On Thu, Nov 24, 2016 at 05:08:53PM +0100, Lena Djokic wrote: > This commit adds necessary conversion of argument passed to inotify_init1. > inotify_init1 flags can be IN_NONBLOCK and IN_CLOEXEC which rely on O_NONBLOCK > and O_CLOEXEC and those can have different values on different platforms. Thanks, applied to linux-user > Signed-off-by: Lena Djokic <Lena.Djokic@rt-rk.com> > --- > linux-user/syscall.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index f5d9a26..41873ca 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -11625,7 +11625,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, > #ifdef CONFIG_INOTIFY1 > #if defined(TARGET_NR_inotify_init1) && defined(__NR_inotify_init1) > case TARGET_NR_inotify_init1: > - ret = get_errno(sys_inotify_init1(arg1)); > + ret = get_errno(sys_inotify_init1(target_to_host_bitmask(arg1, > + fcntl_flags_tbl))); > break; > #endif > #endif > -- > 2.7.4 >
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index f5d9a26..41873ca 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -11625,7 +11625,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #ifdef CONFIG_INOTIFY1 #if defined(TARGET_NR_inotify_init1) && defined(__NR_inotify_init1) case TARGET_NR_inotify_init1: - ret = get_errno(sys_inotify_init1(arg1)); + ret = get_errno(sys_inotify_init1(target_to_host_bitmask(arg1, + fcntl_flags_tbl))); break; #endif #endif
This commit adds necessary conversion of argument passed to inotify_init1. inotify_init1 flags can be IN_NONBLOCK and IN_CLOEXEC which rely on O_NONBLOCK and O_CLOEXEC and those can have different values on different platforms. Signed-off-by: Lena Djokic <Lena.Djokic@rt-rk.com> --- linux-user/syscall.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)