OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix epoll_create1() for qemu-alpha 

-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAl6YeY8SHGxhdXJlbnRA
 dml2aWVyLmV1AAoJEPMMOL0/L74888gQAJ823oxejX2wYElYDNmd3Fy4sFZYaYHJ
 MMN9bdhp+b8SlFc+fYmBtDN3GILbD8eAWmTG6rPEIbH2RMMvkfh+Lw4iOwvIbNdF
 FJ7LYSBAkPHQRgwdc5d0TSdmT2KDyqXJf0wLnh3MZhdYxiZ+g0lPBoflJT59cHUP
 1orOzxR1vFrxl7/2k45CqIUvjooHXQTGRH/WAWA5SWpJg+3C3OM6XW1wmQPAzu8Q
 jmFNbvCGdpd6P8Z06DJv9409oBQJ/y+/dqP3Sq6YAaLjsGbfegwVUNAPhLgxtXlx
 091t3YxC+b/oCSucZDj4m1YDhaiiki+wfgIE4dhzvvXmXVZqOkDuTMianMvLwh6f
 5xXq/kXP8eWDl7TAWwZOK8C7cZxOl+hMrwP1qh9uJUZgDvWtjcUst3Bg/6SPxJkk
 wr2FIB0PJLhj4AFhC9T+u5wR7cPvPXpq3WD9SByzYGWmYdGb8PUKp632Do+sRlSa
 ToO3YbwpKRdlixXj9efwFMEO+5Iy3EQwh1dLMmV1gmx60XD8DRGtLe5RDOmSQKCc
 P1W/EmmcOXk53gj/cTk/Let9X9NLIG7zMMfgFI1GQwUZ4MMWCMen2UV49zb/spb2
 cF8ZN6ZMOmf/zk9FFuoIsH1liXlXfjSuaKQdaOnUjIPMT4FggYRMfuuwHjfyNGKI
 pFHstyCyP9rW
 =INI5
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2020-04-20 14:43:10 +01:00
parent ff0507c239 386d386568
commit d5232d8b06
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-user/syscall.c
View File

@ -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: