From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCDFg-0004Rs-EB for qemu-devel@nongnu.org; Thu, 24 Dec 2015 16:16:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aCDFd-0005Uh-68 for qemu-devel@nongnu.org; Thu, 24 Dec 2015 16:16:48 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:59038) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCDFc-0005UK-S0 for qemu-devel@nongnu.org; Thu, 24 Dec 2015 16:16:45 -0500 References: <1450983599-6060-1-git-send-email-glaubitz@physik.fu-berlin.de> <1450983599-6060-2-git-send-email-glaubitz@physik.fu-berlin.de> From: Laurent Vivier Message-ID: <567C60B9.6080208@vivier.eu> Date: Thu, 24 Dec 2015 22:16:41 +0100 MIME-Version: 1.0 In-Reply-To: <1450983599-6060-2-git-send-email-glaubitz@physik.fu-berlin.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 2/2] linux-user: Add SOCKOP_sendmmsg and SOCKOP_recvmmsg socket call, wire them up. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Paul Adrian Glaubitz , qemu-devel@nongnu.org Le 24/12/2015 19:59, John Paul Adrian Glaubitz a écrit : > Signed-off-by: John Paul Adrian Glaubitz > --- > linux-user/syscall.c | 8 ++++++-- > linux-user/syscall_defs.h | 2 ++ > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 6c64ba6..dd6ed47 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -2171,7 +2171,6 @@ static abi_long do_sendrecvmsg(int fd, abi_ulong target_msg, > return ret; > } > > -#ifdef TARGET_NR_sendmmsg > /* We don't rely on the C library to have sendmmsg/recvmmsg support, > * so it might not have this *mmsg-specific flag either. > */ > @@ -2218,7 +2217,6 @@ static abi_long do_sendrecvmmsg(int fd, abi_ulong target_msgvec, > } > return ret; > } > -#endif > > /* If we don't have a system accept4() then just call accept. > * The callsites to do_accept4() will ensure that they don't > @@ -2441,6 +2439,8 @@ static abi_long do_socketcall(int num, abi_ulong vptr) > [SOCKOP_shutdown] = 2, /* sockfd, how */ > [SOCKOP_sendmsg] = 3, /* sockfd, msg, flags */ > [SOCKOP_recvmsg] = 3, /* sockfd, msg, flags */ > + [SOCKOP_sendmmsg] = 4, /* sockfd, msgvec, vlen, flags */ > + [SOCKOP_recvmmsg] = 4, /* sockfd, msgvec, vlen, flags */ > [SOCKOP_setsockopt] = 5, /* sockfd, level, optname, optval, optlen */ > [SOCKOP_getsockopt] = 5, /* sockfd, level, optname, optval, optlen */ > }; > @@ -2491,6 +2491,10 @@ static abi_long do_socketcall(int num, abi_ulong vptr) > return do_sendrecvmsg(a[0], a[1], a[2], 1); > case SOCKOP_recvmsg: /* sockfd, msg, flags */ > return do_sendrecvmsg(a[0], a[1], a[2], 0); > + case SOCKOP_sendmmsg: /* sockfd, msgvec, vlen, flags */ > + return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 1); > + case SOCKOP_recvmmsg: /* sockfd, msgvec, vlen, flags */ > + return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 0); > case SOCKOP_setsockopt: /* sockfd, level, optname, optval, optlen */ > return do_setsockopt(a[0], a[1], a[2], a[3], a[4]); > case SOCKOP_getsockopt: /* sockfd, level, optname, optval, optlen */ > diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h > index f996acf..0d6d141 100644 > --- a/linux-user/syscall_defs.h > +++ b/linux-user/syscall_defs.h > @@ -28,6 +28,8 @@ > #define SOCKOP_sendmsg 16 > #define SOCKOP_recvmsg 17 > #define SOCKOP_accept4 18 > +#define SOCKOP_recvmmsg 19 > +#define SOCKOP_sendmmsg 20 > > #define IPCOP_semop 1 > #define IPCOP_semget 2 > Reviewed-by: Laurent Vivier