system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-09-06 09:55:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

bsd-user/mmap.c: mmap prefer MAP_ANON for BSD

Browse source 
MAP_ANON and MAP_ANONYMOUS are identical. Prefer MAP_ANON for BSD since
the file is now a confusing mix of the two.

Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Kyle Evans <kevans@FreeBSD.org>
This commit is contained in:
Warner Losh 2021-09-16 18:45:28 -06:00
parent 14837a3f75
commit 953b69cc06
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bsd-user/mmap.c
View file

@ -285,7 +285,7 @@ static abi_ulong mmap_find_vma_aligned(abi_ulong start, abi_ulong size,
addr = start; addr = start;
wrapped = repeat = 0; wrapped = repeat = 0;
prev = 0; prev = 0;
flags = MAP_ANONYMOUS | MAP_PRIVATE; flags = MAP_ANON | MAP_PRIVATE;
if (alignment != 0) { if (alignment != 0) {
flags |= MAP_ALIGNED(alignment); flags |= MAP_ALIGNED(alignment);
} }
@ -409,7 +409,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
if (flags & MAP_FIXED) { if (flags & MAP_FIXED) {
printf("MAP_FIXED "); printf("MAP_FIXED ");
} }
if (flags & MAP_ANONYMOUS) { if (flags & MAP_ANON) {
printf("MAP_ANON "); printf("MAP_ANON ");
} }
if (flags & MAP_EXCL) { if (flags & MAP_EXCL) {
@ -431,7 +431,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
} }
#endif #endif
if ((flags & MAP_ANONYMOUS) && fd != -1) { if ((flags & MAP_ANON) && fd != -1) {
errno = EINVAL; errno = EINVAL;
goto fail; goto fail;
} }
@ -533,7 +533,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
* qemu_real_host_page_size * qemu_real_host_page_size
*/ */
p = mmap(g2h_untagged(start), host_len, prot, p = mmap(g2h_untagged(start), host_len, prot,
flags | MAP_FIXED | ((fd != -1) ? MAP_ANONYMOUS : 0), -1, 0); flags | MAP_FIXED | ((fd != -1) ? MAP_ANON : 0), -1, 0);
if (p == MAP_FAILED) if (p == MAP_FAILED)
goto fail; goto fail;
/* update start so that it points to the file position at 'offset' */ /* update start so that it points to the file position at 'offset' */
@ -696,8 +696,7 @@ static void mmap_reserve(abi_ulong start, abi_ulong size)
} }
if (real_start != real_end) { if (real_start != real_end) {
mmap(g2h_untagged(real_start), real_end - real_start, PROT_NONE, mmap(g2h_untagged(real_start), real_end - real_start, PROT_NONE,
MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);
-1, 0);
} }
} }