Commit d5232d8b authored Apr 20, 2020 by Peter Maydell

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 "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/syscall.c: add target-to-host mapping for epoll_create1()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents ff0507c2 386d3865

linux-user/syscall.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -12012,7 +12012,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
		#endif
		#if defined(TARGET_NR_epoll_create1) && defined(CONFIG_EPOLL_CREATE1)
		case TARGET_NR_epoll_create1:
		return get_errno(epoll_create1(arg1));
		return get_errno(epoll_create1(target_to_host_bitmask(arg1, fcntl_flags_tbl)));
		#endif
		#if defined(TARGET_NR_epoll_ctl)
		case TARGET_NR_epoll_ctl: