diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-29 16:44:13 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-29 16:44:13 +0100 |
| commit | 4f9c5be9191fb08d16023fb6fde1f1d802ce4b44 (patch) | |
| tree | 11fea0d284e6e0bbf1e20b91371c24df18c9a550 /linux-user/socket.h | |
| parent | 4daebe014effba37246b81d25acca5fa2df82f01 (diff) | |
| parent | f63eb01ac7a5b4437d5589ad4343527534bf9d0b (diff) | |
| download | focaccia-qemu-4f9c5be9191fb08d16023fb6fde1f1d802ce4b44.tar.gz focaccia-qemu-4f9c5be9191fb08d16023fb6fde1f1d802ce4b44.zip | |
Merge remote-tracking branch 'remotes/riku/linux-user-for-upstream' into staging
* remotes/riku/linux-user-for-upstream:
linux-user: support the SIOCGIFINDEX ioctl
linux-user: support the KDSIGACCEPT ioctl
linux-user: allow NULL tv argument for settimeofday
linux-user: respect timezone for settimeofday
linux-user: fix struct target_epoll_event layout for MIPS
linux-user: support strace of epoll_create1
linux-user: allow NULL arguments to mount
linux-user: support SO_PASSSEC setsockopt option
linux-user: support SO_{SND, RCV}BUFFORCE setsockopt options
linux-user: support SO_ACCEPTCONN getsockopt option
linux-user: translate the result of getsockopt SO_TYPE
linux-user: added fake open() for /proc/self/cmdline
Add support for MAP_NORESERVE mmap flag.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/socket.h')
| -rw-r--r-- | linux-user/socket.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linux-user/socket.h b/linux-user/socket.h index ae17959902..4dacae6127 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -63,6 +63,7 @@ #define TARGET_SO_PEERSEC 30 #define TARGET_SO_SNDBUFFORCE 31 #define TARGET_SO_RCVBUFFORCE 33 + #define TARGET_SO_PASSSEC 34 /** sock_type - Socket types * @@ -242,6 +243,10 @@ #define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) #define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ + + #define TARGET_SO_PASSSEC 31 +#else + #define TARGET_SO_PASSSEC 34 #endif /* For setsockopt(2) */ |