Skip to content

Commit d5232d8

Browse files
committed
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.0-pull-request' into staging
Fix epoll_create1() for qemu-alpha # gpg: Signature made Thu 16 Apr 2020 16:28:15 BST # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "[email protected]" # gpg: Good signature from "Laurent Vivier <[email protected]>" [full] # gpg: aka "Laurent Vivier <[email protected]>" [full] # gpg: aka "Laurent Vivier (Red Hat) <[email protected]>" [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/syscall.c: add target-to-host mapping for epoll_create1() Signed-off-by: Peter Maydell <[email protected]>
2 parents ff0507c + 386d386 commit d5232d8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

linux-user/syscall.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12012,7 +12012,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
1201212012
#endif
1201312013
#if defined(TARGET_NR_epoll_create1) && defined(CONFIG_EPOLL_CREATE1)
1201412014
case TARGET_NR_epoll_create1:
12015-
return get_errno(epoll_create1(arg1));
12015+
return get_errno(epoll_create1(target_to_host_bitmask(arg1, fcntl_flags_tbl)));
1201612016
#endif
1201712017
#if defined(TARGET_NR_epoll_ctl)
1201812018
case TARGET_NR_epoll_ctl:

0 commit comments

Comments
 (0)