On Fri, Oct 8, 2021 at 4:24 PM Warner Losh <i...@bsdimp.com> wrote: > > 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 <i...@bsdimp.com> > Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> > Reviewed-by: Richard Henderson <richard.hender...@linaro.org> > --- > bsd-user/mmap.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c > index f0be3b12cf..301108ed25 100644 > --- a/bsd-user/mmap.c > +++ b/bsd-user/mmap.c > @@ -285,7 +285,7 @@ static abi_ulong mmap_find_vma_aligned(abi_ulong start, > abi_ulong size, > addr = start; > wrapped = repeat = 0; > prev = 0; > - flags = MAP_ANONYMOUS | MAP_PRIVATE; > + flags = MAP_ANON | MAP_PRIVATE; > if (alignment != 0) { > flags |= MAP_ALIGNED(alignment); > } > @@ -409,7 +409,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int > prot, > if (flags & MAP_FIXED) { > printf("MAP_FIXED "); > } > - if (flags & MAP_ANONYMOUS) { > + if (flags & MAP_ANON) { > printf("MAP_ANON "); > } > if (flags & MAP_EXCL) { > @@ -431,7 +431,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int > prot, > } > #endif > > - if ((flags & MAP_ANONYMOUS) && fd != -1) { > + if ((flags & MAP_ANON) && fd != -1) { > errno = EINVAL; > goto fail; > } > @@ -533,7 +533,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int > prot, > * qemu_real_host_page_size > */ > 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) > goto fail; > /* 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) { > mmap(g2h_untagged(real_start), real_end - real_start, PROT_NONE, > - MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, > - -1, 0); > + MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0); > } > } > > -- > 2.32.0 >
Reviewed-by: Kyle Evans <kev...@freebsd.org>