[PATCH 1/2] Replace x86-64 paccept with accept4.

[Paolo Bonzini]

This patch changes the paccept syscall to accept4 for x86-64, since
the former was dropped in Linux kernel commit 2d4c8266.

At the same time, it adds support for pretty-printing its arguments.

* linux/x86_64/syscallent.h: Replace paccept with accept4,
hook in sys_accept4.
* net.c (sys_accept): Leave a small stub calling the new...
(do_accept): ... function, which also adds a flags_arg argument.
(sys_accept4): New.
---
 linux/syscall.h           |    2 +-
 linux/x86_64/syscallent.h |    2 +-
 net.c                     |   24 +++++++++++++++++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/linux/syscall.h b/linux/syscall.h
index 60df934..b373ec8 100644
--- a/linux/syscall.h
+++ b/linux/syscall.h
@@ -109,7 +109,7 @@ int sys_signalfd4(), sys_eventfd2(), sys_epoll_create1(), sys_dup3(), sys_pipe2(
 
 /* sys_socketcall subcalls */
 
-int sys_socket(), sys_bind(), sys_connect(), sys_listen();
+int sys_socket(), sys_bind(), sys_connect(), sys_listen(), sys_accept4();
 int sys_accept(), sys_getsockname(), sys_getpeername(), sys_socketpair();
 int sys_send(), sys_recv(), sys_sendto(), sys_recvfrom();
 int sys_shutdown(), sys_setsockopt(), sys_getsockopt();
diff --git a/linux/x86_64/syscallent.h b/linux/x86_64/syscallent.h
index fd18715..a941dcb 100644
--- a/linux/x86_64/syscallent.h
+++ b/linux/x86_64/syscallent.h
@@ -286,7 +286,7 @@
 	{ 6,	TF,	sys_fallocate,		"fallocate"	}, /* 285 */
 	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"}, /* 286 */
 	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"}, /* 287 */
-	{ 6,	TN,	printargs,		"paccept"	}, /* 288 */
+	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 288 */
 	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 289 */
 	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 290 */
 	{ 1,	0,	sys_epoll_create1,	"epoll_create1"	}, /* 291 */
diff --git a/net.c b/net.c
index 9759268..b18f57e 100644
--- a/net.c
+++ b/net.c
@@ -1303,9 +1303,8 @@ struct tcb *tcp;
 	return 0;
 }
 
-int
-sys_accept(tcp)
-struct tcb *tcp;
+static int
+do_accept(struct tcb *tcp, int flags_arg)
 {
 	if (entering(tcp)) {
 		tprintf("%ld, ", tcp->u_arg[0]);
@@ -1321,11 +1320,30 @@ struct tcb *tcp;
 		}
 		tprintf(", ");
 		printnum_int(tcp, tcp->u_arg[2], "%u");
+		if (flags_arg >= 0) {
+			tprintf(", ");
+			printflags(sock_type_flags, tcp->u_arg[flags_arg],
+				   "SOCK_???");
+		}
 	}
 	return 0;
 }
 
 int
+sys_accept(struct tcb *tcp)
+{
+	return do_accept(tcp, -1);
+}
+
+#ifdef LINUX
+int
+sys_accept4(struct tcb *tcp)
+{
+	return do_accept(tcp, 3);
+}
+#endif
+
+int
 sys_send(tcp)
 struct tcb *tcp;
 {
-- 
1.6.2.5