[Qemu-devel] [PATCH 0/4] linux-user: syscall number fixes

[Qemu-devel] [PATCH 0/4] linux-user: syscall number fixes

[Richard Henderson]

Found while removing some ifdefs that should have been always true.


r~


Richard Henderson (4):
  linux-user/alpha: Fix epoll syscalls
  linux-user/hppa: Fix typo in mknodat syscall
  linux-user/microblaze: Fix typo in accept4 syscall
  linux-user/sparc64: Add inotify_rm_watch and tee syscalls

 linux-user/alpha/syscall_nr.h      | 6 +++---
 linux-user/hppa/syscall_nr.h       | 2 +-
 linux-user/microblaze/syscall_nr.h | 2 +-
 linux-user/sparc64/syscall_nr.h    | 4 ++--
 linux-user/strace.list             | 9 ---------
 5 files changed, 7 insertions(+), 16 deletions(-)

-- 
2.17.1

[Qemu-devel] [PATCH 1/4] linux-user/alpha: Fix epoll syscalls

[Richard Henderson]

These were named incorrectly, going so far as to invade strace.list.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/alpha/syscall_nr.h | 6 +++---
 linux-user/strace.list        | 9 ---------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/linux-user/alpha/syscall_nr.h b/linux-user/alpha/syscall_nr.h
index 00e14bb6b3..6532376e3e 100644
--- a/linux-user/alpha/syscall_nr.h
+++ b/linux-user/alpha/syscall_nr.h
@@ -343,9 +343,9 @@
 #define TARGET_NR_io_cancel			402
 #define TARGET_NR_exit_group			405
 #define TARGET_NR_lookup_dcookie		406
-#define TARGET_NR_sys_epoll_create		407
-#define TARGET_NR_sys_epoll_ctl		408
-#define TARGET_NR_sys_epoll_wait		409
+#define TARGET_NR_epoll_create		407
+#define TARGET_NR_epoll_ctl		408
+#define TARGET_NR_epoll_wait		409
 #define TARGET_NR_remap_file_pages		410
 #define TARGET_NR_set_tid_address		411
 #define TARGET_NR_restart_syscall		412
diff --git a/linux-user/strace.list b/linux-user/strace.list
index a91e33f7e5..2bc5ba04d4 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -1467,15 +1467,6 @@
 #ifdef TARGET_NR__sysctl
 { TARGET_NR__sysctl, "_sysctl" , NULL, NULL, NULL },
 #endif
-#ifdef TARGET_NR_sys_epoll_create
-{ TARGET_NR_sys_epoll_create, "sys_epoll_create" , NULL, NULL, NULL },
-#endif
-#ifdef TARGET_NR_sys_epoll_ctl
-{ TARGET_NR_sys_epoll_ctl, "sys_epoll_ctl" , NULL, NULL, NULL },
-#endif
-#ifdef TARGET_NR_sys_epoll_wait
-{ TARGET_NR_sys_epoll_wait, "sys_epoll_wait" , NULL, NULL, NULL },
-#endif
 #ifdef TARGET_NR_sysfs
 { TARGET_NR_sysfs, "sysfs" , NULL, NULL, NULL },
 #endif
-- 
2.17.1

[Qemu-devel] [PATCH 2/4] linux-user/hppa: Fix typo in mknodat syscall

[Richard Henderson]

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/hppa/syscall_nr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/hppa/syscall_nr.h b/linux-user/hppa/syscall_nr.h
index 55bdf71d50..9c1d0a195d 100644
--- a/linux-user/hppa/syscall_nr.h
+++ b/linux-user/hppa/syscall_nr.h
@@ -279,7 +279,7 @@
 #define TARGET_NR_ppoll             274
 #define TARGET_NR_openat            275
 #define TARGET_NR_mkdirat           276
-#define TARGET_NR_mknotat           277
+#define TARGET_NR_mknodat           277
 #define TARGET_NR_fchownat          278
 #define TARGET_NR_futimesat         279
 #define TARGET_NR_fstatat64         280
-- 
2.17.1

[Qemu-devel] [PATCH 3/4] linux-user/microblaze: Fix typo in accept4 syscall

[Richard Henderson]

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/microblaze/syscall_nr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/microblaze/syscall_nr.h b/linux-user/microblaze/syscall_nr.h
index 0704449bae..761208e9e6 100644
--- a/linux-user/microblaze/syscall_nr.h
+++ b/linux-user/microblaze/syscall_nr.h
@@ -363,7 +363,7 @@
 #define TARGET_NR_shutdown		359 /* new */
 #define TARGET_NR_sendmsg		360 /* new */
 #define TARGET_NR_recvmsg		361 /* new */
-#define TARGET_NR_accept04		362 /* new */
+#define TARGET_NR_accept4		362 /* new */
 #define TARGET_NR_preadv                363 /* new */
 #define TARGET_NR_pwritev               364 /* new */
 #define TARGET_NR_rt_tgsigqueueinfo     365 /* new */
-- 
2.17.1

[Qemu-devel] [PATCH 4/4] linux-user/sparc64: Add inotify_rm_watch and tee syscalls

[Richard Henderson]

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/sparc64/syscall_nr.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux-user/sparc64/syscall_nr.h b/linux-user/sparc64/syscall_nr.h
index 9391645598..0b91b896da 100644
--- a/linux-user/sparc64/syscall_nr.h
+++ b/linux-user/sparc64/syscall_nr.h
@@ -154,7 +154,7 @@
 #define TARGET_NR_poll               153 /* Common                                      */
 #define TARGET_NR_getdents64		154 /* Linux specific				   */
 #define TARGET_NR_fcntl64            155 /* Linux sparc32 Specific                      */
-/* #define TARGET_NR_getdirentries   156    SunOS Specific                              */
+#define TARGET_NR_inotify_rm_watch   156 /* Linux specific                              */
 #define TARGET_NR_statfs             157 /* Common                                      */
 #define TARGET_NR_fstatfs            158 /* Common                                      */
 #define TARGET_NR_umount             159 /* Common                                      */
@@ -278,7 +278,7 @@
 #define TARGET_NR_mq_notify		277
 #define TARGET_NR_mq_getsetattr	278
 #define TARGET_NR_waitid		279
-/*#define TARGET_NR_sys_setaltroot	280 available (was setaltroot) */
+#define TARGET_NR_tee                   280
 #define TARGET_NR_add_key		281
 #define TARGET_NR_request_key	282
 #define TARGET_NR_keyctl		283
-- 
2.17.1

Re: [Qemu-devel] [PATCH 0/4] linux-user: syscall number fixes

[no-reply]

Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20180607184844.30126-1-richard.henderson@linaro.org
Subject: [Qemu-devel] [PATCH 0/4] linux-user: syscall number fixes

=== TEST SCRIPT BEGIN ===
#!/bin/bash

BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0

git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram

commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
    echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
    if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
        failed=1
        echo
    fi
    n=$((n+1))
done

exit $failed
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 * [new tag]               patchew/20180607184844.30126-1-richard.henderson@linaro.org -> patchew/20180607184844.30126-1-richard.henderson@linaro.org
Switched to a new branch 'test'
6080fbaefd linux-user/sparc64: Add inotify_rm_watch and tee syscalls
a332062a9c linux-user/microblaze: Fix typo in accept4 syscall
04bf90a937 linux-user/hppa: Fix typo in mknodat syscall
63845de478 linux-user/alpha: Fix epoll syscalls

=== OUTPUT BEGIN ===
Checking PATCH 1/4: linux-user/alpha: Fix epoll syscalls...
ERROR: code indent should never use tabs
#22: FILE: linux-user/alpha/syscall_nr.h:346:
+#define TARGET_NR_epoll_create^I^I407$

ERROR: code indent should never use tabs
#23: FILE: linux-user/alpha/syscall_nr.h:347:
+#define TARGET_NR_epoll_ctl^I^I408$

ERROR: code indent should never use tabs
#24: FILE: linux-user/alpha/syscall_nr.h:348:
+#define TARGET_NR_epoll_wait^I^I409$

total: 3 errors, 0 warnings, 27 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

Checking PATCH 2/4: linux-user/hppa: Fix typo in mknodat syscall...
Checking PATCH 3/4: linux-user/microblaze: Fix typo in accept4 syscall...
ERROR: code indent should never use tabs
#18: FILE: linux-user/microblaze/syscall_nr.h:366:
+#define TARGET_NR_accept4^I^I362 /* new */$

total: 1 errors, 0 warnings, 8 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

Checking PATCH 4/4: linux-user/sparc64: Add inotify_rm_watch and tee syscalls...
WARNING: line over 80 characters
#18: FILE: linux-user/sparc64/syscall_nr.h:157:
+#define TARGET_NR_inotify_rm_watch   156 /* Linux specific                              */

total: 0 errors, 1 warnings, 16 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [Qemu-devel] [PATCH 2/4] linux-user/hppa: Fix typo in mknodat syscall

[Philippe Mathieu-Daudé]

On 06/07/2018 03:48 PM, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

mknodat is not at 8ee78dece0d.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  linux-user/hppa/syscall_nr.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/linux-user/hppa/syscall_nr.h b/linux-user/hppa/syscall_nr.h
> index 55bdf71d50..9c1d0a195d 100644
> --- a/linux-user/hppa/syscall_nr.h
> +++ b/linux-user/hppa/syscall_nr.h
> @@ -279,7 +279,7 @@
>  #define TARGET_NR_ppoll             274
>  #define TARGET_NR_openat            275
>  #define TARGET_NR_mkdirat           276
> -#define TARGET_NR_mknotat           277
> +#define TARGET_NR_mknodat           277
>  #define TARGET_NR_fchownat          278
>  #define TARGET_NR_futimesat         279
>  #define TARGET_NR_fstatat64         280
> 

Re: [Qemu-devel] [PATCH 3/4] linux-user/microblaze: Fix typo in accept4 syscall

[Philippe Mathieu-Daudé]

On 06/07/2018 03:48 PM, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

04 since '09: 8dfbe4e839e.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  linux-user/microblaze/syscall_nr.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/linux-user/microblaze/syscall_nr.h b/linux-user/microblaze/syscall_nr.h
> index 0704449bae..761208e9e6 100644
> --- a/linux-user/microblaze/syscall_nr.h
> +++ b/linux-user/microblaze/syscall_nr.h
> @@ -363,7 +363,7 @@
>  #define TARGET_NR_shutdown		359 /* new */
>  #define TARGET_NR_sendmsg		360 /* new */
>  #define TARGET_NR_recvmsg		361 /* new */
> -#define TARGET_NR_accept04		362 /* new */
> +#define TARGET_NR_accept4		362 /* new */
>  #define TARGET_NR_preadv                363 /* new */
>  #define TARGET_NR_pwritev               364 /* new */
>  #define TARGET_NR_rt_tgsigqueueinfo     365 /* new */
> 

Re: [Qemu-devel] [PATCH 1/4] linux-user/alpha: Fix epoll syscalls

[Laurent Vivier]

Le 07/06/2018 à 20:48, Richard Henderson a écrit :
> These were named incorrectly, going so far as to invade strace.list.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  linux-user/alpha/syscall_nr.h | 6 +++---
>  linux-user/strace.list        | 9 ---------
>  2 files changed, 3 insertions(+), 12 deletions(-)

Reviewed-by: Laurent Vivier <laurent@vivier.eu>

Re: [Qemu-devel] [PATCH 2/4] linux-user/hppa: Fix typo in mknodat syscall

[Laurent Vivier]

Le 07/06/2018 à 20:48, Richard Henderson a écrit :
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  linux-user/hppa/syscall_nr.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/linux-user/hppa/syscall_nr.h b/linux-user/hppa/syscall_nr.h
> index 55bdf71d50..9c1d0a195d 100644
> --- a/linux-user/hppa/syscall_nr.h
> +++ b/linux-user/hppa/syscall_nr.h
> @@ -279,7 +279,7 @@
>  #define TARGET_NR_ppoll             274
>  #define TARGET_NR_openat            275
>  #define TARGET_NR_mkdirat           276
> -#define TARGET_NR_mknotat           277
> +#define TARGET_NR_mknodat           277
>  #define TARGET_NR_fchownat          278
>  #define TARGET_NR_futimesat         279
>  #define TARGET_NR_fstatat64         280
> 

Reviewed-by: Laurent Vivier <laurent@vivier.eu>

Re: [Qemu-devel] [PATCH 3/4] linux-user/microblaze: Fix typo in accept4 syscall

[Laurent Vivier]

Le 07/06/2018 à 20:48, Richard Henderson a écrit :
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  linux-user/microblaze/syscall_nr.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/linux-user/microblaze/syscall_nr.h b/linux-user/microblaze/syscall_nr.h
> index 0704449bae..761208e9e6 100644
> --- a/linux-user/microblaze/syscall_nr.h
> +++ b/linux-user/microblaze/syscall_nr.h
> @@ -363,7 +363,7 @@
>  #define TARGET_NR_shutdown		359 /* new */
>  #define TARGET_NR_sendmsg		360 /* new */
>  #define TARGET_NR_recvmsg		361 /* new */
> -#define TARGET_NR_accept04		362 /* new */
> +#define TARGET_NR_accept4		362 /* new */
>  #define TARGET_NR_preadv                363 /* new */
>  #define TARGET_NR_pwritev               364 /* new */
>  #define TARGET_NR_rt_tgsigqueueinfo     365 /* new */
> 

Reviewed-by: Laurent Vivier <laurent@vivier.eu>

Re: [Qemu-devel] [PATCH 4/4] linux-user/sparc64: Add inotify_rm_watch and tee syscalls

[Laurent Vivier]

Le 07/06/2018 à 20:48, Richard Henderson a écrit :
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  linux-user/sparc64/syscall_nr.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/linux-user/sparc64/syscall_nr.h b/linux-user/sparc64/syscall_nr.h
> index 9391645598..0b91b896da 100644
> --- a/linux-user/sparc64/syscall_nr.h
> +++ b/linux-user/sparc64/syscall_nr.h
> @@ -154,7 +154,7 @@
>  #define TARGET_NR_poll               153 /* Common                                      */
>  #define TARGET_NR_getdents64		154 /* Linux specific				   */
>  #define TARGET_NR_fcntl64            155 /* Linux sparc32 Specific                      */
> -/* #define TARGET_NR_getdirentries   156    SunOS Specific                              */
> +#define TARGET_NR_inotify_rm_watch   156 /* Linux specific                              */
>  #define TARGET_NR_statfs             157 /* Common                                      */
>  #define TARGET_NR_fstatfs            158 /* Common                                      */
>  #define TARGET_NR_umount             159 /* Common                                      */
> @@ -278,7 +278,7 @@
>  #define TARGET_NR_mq_notify		277
>  #define TARGET_NR_mq_getsetattr	278
>  #define TARGET_NR_waitid		279
> -/*#define TARGET_NR_sys_setaltroot	280 available (was setaltroot) */
> +#define TARGET_NR_tee                   280
>  #define TARGET_NR_add_key		281
>  #define TARGET_NR_request_key	282
>  #define TARGET_NR_keyctl		283
> 

Reviewed-by: Laurent Vivier <laurent@vivier.eu>

Re: [Qemu-devel] [PATCH 0/4] linux-user: syscall number fixes

[Laurent Vivier]

Le 07/06/2018 à 20:56, no-reply@patchew.org a écrit :
...
> === OUTPUT BEGIN ===
> Checking PATCH 1/4: linux-user/alpha: Fix epoll syscalls...
> ERROR: code indent should never use tabs
> #22: FILE: linux-user/alpha/syscall_nr.h:346:
> +#define TARGET_NR_epoll_create^I^I407$
> 
> ERROR: code indent should never use tabs
> #23: FILE: linux-user/alpha/syscall_nr.h:347:
> +#define TARGET_NR_epoll_ctl^I^I408$
> 
> ERROR: code indent should never use tabs
> #24: FILE: linux-user/alpha/syscall_nr.h:348:
> +#define TARGET_NR_epoll_wait^I^I409$
> 
> total: 3 errors, 0 warnings, 27 lines checked
...
> ERROR: code indent should never use tabs
> #18: FILE: linux-user/microblaze/syscall_nr.h:366:
> +#define TARGET_NR_accept4^I^I362 /* new */$
> 

If you agree, I will remove tabs when I'll commit the patches for the
pull-request.

Thanks,
Laurent

Re: [Qemu-devel] [PATCH 0/4] linux-user: syscall number fixes

[Richard Henderson]

On 06/07/2018 10:17 AM, Laurent Vivier wrote:
> If you agree, I will remove tabs when I'll commit the patches for the
> pull-request.

Yes please.  I should have noticed them there when making my change.


r~