Noticed when ran GHC on alpha:
$ qemu-alpha -L /usr/alpha-unknown-linux-gnu/ /tmp/a
qemu: Unsupported syscall: 407
linux-user/syscall.c does have 'epoll_create' wiring,
but under nondeprecated name.
Instead of defining both
TARGET_NR_sys_epoll_create
and
TARGET_NR_epoll_create
I've renamed former to later as old name is not used
anywhere else in qemu (except the linux-user/strace.list).
After this change GHC works fine under qemu-alpha:
$ ./alpha-linux-user/qemu-alpha -L /usr/alpha-unknown-linux-gnu/ /tmp/a
...
Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: qemu-devel@nongnu.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
Change since v1:
- cleaned up 'linux-user/strace.list' from deprecated defines
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..e848154663 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 3b1282ec1a..ccfb58b7f4 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.13.0
Hi, This series seems to have some coding style problems. See output below for more information: Type: series Message-id: 20170531075814.4851-1-slyfox@gentoo.org Subject: [Qemu-devel] [PATCH v2] alpha-user: wire epoll_create, epoll_ctl, epoll_wait === 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 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 Switched to a new branch 'test' 89217fd alpha-user: wire epoll_create, epoll_ctl, epoll_wait === OUTPUT BEGIN === Checking PATCH 1/1: alpha-user: wire epoll_create, epoll_ctl, epoll_wait... ERROR: code indent should never use tabs #41: FILE: linux-user/alpha/syscall_nr.h:346: +#define TARGET_NR_epoll_create^I^I^I407$ ERROR: code indent should never use tabs #42: FILE: linux-user/alpha/syscall_nr.h:347: +#define TARGET_NR_epoll_ctl^I^I^I408$ ERROR: code indent should never use tabs #43: FILE: linux-user/alpha/syscall_nr.h:348: +#define TARGET_NR_epoll_wait^I^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. === OUTPUT END === Test command exited with code: 1 --- Email generated automatically by Patchew [http://patchew.org/]. Please send your feedback to patchew-devel@freelists.org
© 2016 - 2024 Red Hat, Inc.