diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-23 14:38:43 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-23 14:38:43 +0000 |
| commit | b7c359c748a2e3ccb97a184b9739feb2cd48de2f (patch) | |
| tree | b08fefe2ba5816d620286165bf3fa006bfb84a2a /linux-user/syscall.c | |
| parent | 7cea426c1d2e12777a2e61d7970044981ff82aa8 (diff) | |
| parent | a7b09746679c1815115249ec69197e454efdfb15 (diff) | |
| download | focaccia-qemu-b7c359c748a2e3ccb97a184b9739feb2cd48de2f.tar.gz focaccia-qemu-b7c359c748a2e3ccb97a184b9739feb2cd48de2f.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.0-pull-request' into staging
Fix mmap guest space and brk Add FS/FD/RTC/KCOV ioctls # gpg: Signature made Thu 23 Jan 2020 08:21:41 GMT # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/linux-user-for-5.0-pull-request: linux-user: Add support for read/clear RTC voltage low detector using ioctls linux-user: Add support for getting/setting RTC PLL correction using ioctls linux-user: Add support for getting/setting RTC wakeup alarm using ioctls linux-user: Add support for getting/setting RTC periodic interrupt and epoch using ioctls linux-user: Add support for getting/setting RTC time and alarm using ioctls linux-user: Add support for enabling/disabling RTC features using ioctls linux-user: Add support for TYPE_LONG and TYPE_ULONG in do_ioctl() linux-user: Add support for KCOV_INIT_TRACE ioctl linux-user: Add support for KCOV_<ENABLE|DISABLE> ioctls configure: Detect kcov support and introduce CONFIG_KCOV linux-user: Add support for FDFMT<BEG|TRK|END> ioctls linux-user: Add support for FD<SETEMSGTRESH|SETMAXERRS|GETMAXERRS> ioctls linux-user: Add support for FS_IOC32_<GET|SET>VERSION ioctls linux-user: Add support for FS_IOC32_<GET|SET>FLAGS ioctls linux-user: Add support for FS_IOC_<GET|SET>VERSION ioctls linux-user: Reserve space for brk linux-user:Fix align mistake when mmap guest space Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/syscall.c')
| -rw-r--r-- | linux-user/syscall.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 249e4b95fc..d60142f069 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -73,6 +73,9 @@ #ifdef CONFIG_SENDFILE #include <sys/sendfile.h> #endif +#ifdef CONFIG_KCOV +#include <sys/kcov.h> +#endif #define termios host_termios #define winsize host_winsize @@ -107,6 +110,7 @@ #include <netpacket/packet.h> #include <linux/netlink.h> #include <linux/if_alg.h> +#include <linux/rtc.h> #include "linux_loop.h" #include "uname.h" @@ -5175,6 +5179,8 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) break; case TYPE_PTRVOID: case TYPE_INT: + case TYPE_LONG: + case TYPE_ULONG: ret = get_errno(safe_ioctl(fd, ie->host_cmd, arg)); break; case TYPE_PTR: |