Commit 5a53dc50 authored by John Paul Adrian Glaubitz's avatar John Paul Adrian Glaubitz Committed by Riku Voipio
Browse files

linux-user: Add SOCKOP_sendmmsg and SOCKOP_recvmmsg socket call, wire them up. 



Adds the definitions for the socket calls SOCKOP_sendmmsg
and SOCKOP_recvmmsg and wires them up with the rest of the code.
The necessary function do_sendrecvmmsg() is already present in
linux-user/syscall.c. After adding these two definitions and wiring
them up, I no longer receive an error message about the
unimplemented socket calls when running "apt-get update" on Debian
unstable running on qemu with glibc_2.21 on m68k.

Signed-off-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent e73eecbd

linux-user/syscall.c

+6 −2
Original line number Diff line number Diff line
@@ -2272,7 +2272,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.

 */
@@ -2319,7 +2318,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
@@ -2542,6 +2540,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 */

    };
@@ -2592,6 +2592,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 */

linux-user/syscall_defs.h

+2 −0
Original line number Diff line number Diff line
@@ -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