[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 045/108] linux-user: Split out accept, accept4, b
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v2 045/108] linux-user: Split out accept, accept4, bind, connect |
Date: |
Sat, 9 Jun 2018 17:01:17 -1000 |
All targets define accept4; remove the ifdef.
Signed-off-by: Richard Henderson <address@hidden>
---
linux-user/syscall.c | 52 ++++++++++++++++++++++++++++++--------------
1 file changed, 36 insertions(+), 16 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index d50c84614e..155da4f523 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7730,6 +7730,18 @@ static abi_long impl_##NAME(void *cpu_env, unsigned num,
abi_long arg1, \
abi_long arg5, abi_long arg6, abi_long arg7, \
abi_long arg8)
+#ifdef TARGET_NR_accept
+IMPL(accept)
+{
+ return do_accept4(arg1, arg2, arg3, 0);
+}
+#endif
+
+IMPL(accept4)
+{
+ return do_accept4(arg1, arg2, arg3, arg4);
+}
+
#ifdef TARGET_NR_access
IMPL(access)
{
@@ -7769,6 +7781,13 @@ IMPL(alarm)
}
#endif
+#ifdef TARGET_NR_bind
+IMPL(bind)
+{
+ return do_bind(arg1, arg2, arg3);
+}
+#endif
+
IMPL(brk)
{
return do_brk(arg1);
@@ -7821,6 +7840,13 @@ IMPL(close)
return get_errno(close(arg1));
}
+#ifdef TARGET_NR_connect
+IMPL(connect)
+{
+ return do_connect(arg1, arg2, arg3);
+}
+#endif
+
#ifdef TARGET_NR_creat
IMPL(creat)
{
@@ -9925,22 +9951,6 @@ static abi_long do_syscall1(void *cpu_env, unsigned num,
abi_long arg1,
void *p;
switch(num) {
-#ifdef TARGET_NR_accept
- case TARGET_NR_accept:
- return do_accept4(arg1, arg2, arg3, 0);
-#endif
-#ifdef TARGET_NR_accept4
- case TARGET_NR_accept4:
- return do_accept4(arg1, arg2, arg3, arg4);
-#endif
-#ifdef TARGET_NR_bind
- case TARGET_NR_bind:
- return do_bind(arg1, arg2, arg3);
-#endif
-#ifdef TARGET_NR_connect
- case TARGET_NR_connect:
- return do_connect(arg1, arg2, arg3);
-#endif
#ifdef TARGET_NR_getpeername
case TARGET_NR_getpeername:
return do_getpeername(arg1, arg2, arg3);
@@ -12769,9 +12779,16 @@ static impl_fn *syscall_table(unsigned num)
#ifdef TARGET_NR_access
SYSCALL(access);
#endif
+#ifdef TARGET_NR_accept
+ SYSCALL(accept);
+#endif
+ SYSCALL(accept4);
SYSCALL(acct);
#ifdef TARGET_NR_alarm
SYSCALL(alarm);
+#endif
+#ifdef TARGET_NR_bind
+ SYSCALL(bind);
#endif
SYSCALL(brk);
SYSCALL(close);
@@ -12780,6 +12797,9 @@ static impl_fn *syscall_table(unsigned num)
#ifdef TARGET_NR_chmod
SYSCALL(chmod);
#endif
+#ifdef TARGET_NR_connect
+ SYSCALL(connect);
+#endif
#ifdef TARGET_NR_creat
SYSCALL(creat);
#endif
--
2.17.1
- [Qemu-devel] [PATCH v2 035/108] linux-user: Split out select, pselect6, newselect, (continued)
- [Qemu-devel] [PATCH v2 035/108] linux-user: Split out select, pselect6, newselect, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 034/108] linux-user: Split out getrlimit, getrusage, gettimeofday, settimeofday, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 037/108] linux-user: Split out readlink, readlinkat, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 038/108] linux-user: Split out mmap, mmap2, reboot, swapon, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 039/108] linux-user: Split out mprotect, mremap, msync, munmap, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 040/108] linux-user: Split out mlock, mlockall, munlock, munlockall, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 041/108] linux-user: Split out fchmod, fchmodat, ftruncate, truncate, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 042/108] linux-user: Split out fstatfs, fstatfs64, statfs, statfs64, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 043/108] linux-user: Split out getpriority, setpriority, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 044/108] linux-user: Split out socketcall, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 045/108] linux-user: Split out accept, accept4, bind, connect,
Richard Henderson <=
- [Qemu-devel] [PATCH v2 046/108] linux-user: Split out 7 syscalls, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 047/108] linux-user: Split out recvmmsg, send, sendmmsg, sendmsg, sendto, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 048/108] linux-user: Split out getrandom, shutdown, setsockopt, socket, socketpair, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 049/108] linux-user: Fix stub gettid, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 050/108] linux-user: Split out getitimer, setitimer, syslog, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 051/108] linux-user: Split out fstat, lstat, stat, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 052/108] linux-user: Unwrap TARGET_NR_syscall early, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 053/108] linux-user: Split out swapoff, sysinfo, vhangup, wait4, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 054/108] linux-user: Split out ipc, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 055/108] linux-user: Split out ipc syscalls, Richard Henderson, 2018/06/09