From: Kyle Evans <kevans@freebsd.org>
To: Warner Losh <imp@bsdimp.com>
Cc: "Kyle Evans" <kevans@freebsd.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"QEMU Developers" <qemu-devel@nongnu.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: Re: [PATCH v3 3/9] bsd-user/mmap.c: MAP_ symbols are defined, so no need for ifdefs
Date: Thu, 14 Oct 2021 10:06:46 -0500 [thread overview]
Message-ID: <CACNAnaFe0+vX5kkdwyk9Of5j+1SphCRAA3brpuWjfLqn=ubf8g@mail.gmail.com> (raw)
In-Reply-To: <20211008212344.95537-4-imp@bsdimp.com>
On Fri, Oct 8, 2021 at 4:24 PM Warner Losh <imp@bsdimp.com> wrote:
>
> All these MAP_ symbols are always defined on supported FreeBSD versions
> (12.2 and newer), so remove the #ifdefs since they aren't needed.
>
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Acked-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> bsd-user/mmap.c | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
> index 4f4fa3ab46..6f33aec58b 100644
> --- a/bsd-user/mmap.c
> +++ b/bsd-user/mmap.c
> @@ -286,13 +286,9 @@ static abi_ulong mmap_find_vma_aligned(abi_ulong start, abi_ulong size,
> wrapped = repeat = 0;
> prev = 0;
> flags = MAP_ANONYMOUS | MAP_PRIVATE;
> -#ifdef MAP_ALIGNED
> if (alignment != 0) {
> flags |= MAP_ALIGNED(alignment);
> }
> -#else
> - /* XXX TODO */
> -#endif
>
> for (;; prev = ptr) {
> /*
> @@ -407,22 +403,18 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
> printf("MAP_ALIGNED(%u) ", (flags & MAP_ALIGNMENT_MASK)
> >> MAP_ALIGNMENT_SHIFT);
> }
> -#if MAP_GUARD
> if (flags & MAP_GUARD) {
> printf("MAP_GUARD ");
> }
> -#endif
> if (flags & MAP_FIXED) {
> printf("MAP_FIXED ");
> }
> if (flags & MAP_ANONYMOUS) {
> printf("MAP_ANON ");
> }
> -#ifdef MAP_EXCL
> if (flags & MAP_EXCL) {
> printf("MAP_EXCL ");
> }
> -#endif
> if (flags & MAP_PRIVATE) {
> printf("MAP_PRIVATE ");
> }
> @@ -432,11 +424,9 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
> if (flags & MAP_NOCORE) {
> printf("MAP_NOCORE ");
> }
> -#ifdef MAP_STACK
> if (flags & MAP_STACK) {
> printf("MAP_STACK ");
> }
> -#endif
> printf("fd=%d offset=0x%llx\n", fd, offset);
> }
> #endif
> @@ -445,7 +435,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
> errno = EINVAL;
> goto fail;
> }
> -#ifdef MAP_STACK
> if (flags & MAP_STACK) {
> if ((fd != -1) || ((prot & (PROT_READ | PROT_WRITE)) !=
> (PROT_READ | PROT_WRITE))) {
> @@ -453,8 +442,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
> goto fail;
> }
> }
> -#endif /* MAP_STACK */
> -#ifdef MAP_GUARD
> if ((flags & MAP_GUARD) && (prot != PROT_NONE || fd != -1 ||
> offset != 0 || (flags & (MAP_SHARED | MAP_PRIVATE |
> /* MAP_PREFAULT | */ /* MAP_PREFAULT not in mman.h */
> @@ -462,7 +449,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
> errno = EINVAL;
> goto fail;
> }
> -#endif
>
> if (offset & ~TARGET_PAGE_MASK) {
> errno = EINVAL;
> --
> 2.32.0
>
>
Reviewed-by: Kyle Evans <kevans@FreeBSD.org>
next prev parent reply other threads:[~2021-10-14 15:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-08 21:23 [PATCH v3 0/9] bsd-user mmap fixes Warner Losh
2021-10-08 21:23 ` [PATCH v3 1/9] bsd-user/mmap.c: Always zero MAP_ANONYMOUS memory in mmap_frag() Warner Losh
2021-10-14 15:05 ` Kyle Evans
2021-10-08 21:23 ` [PATCH v3 2/9] bsd-user/mmap.c: check pread's return value to fix warnings with _FORTIFY_SOURCE Warner Losh
2021-10-14 15:06 ` Kyle Evans
2021-10-08 21:23 ` [PATCH v3 3/9] bsd-user/mmap.c: MAP_ symbols are defined, so no need for ifdefs Warner Losh
2021-10-14 15:06 ` Kyle Evans [this message]
2021-10-08 21:23 ` [PATCH v3 4/9] bsd-user/mmap.c: mmap return ENOMEM on overflow Warner Losh
2021-10-14 15:13 ` Kyle Evans
2021-10-08 21:23 ` [PATCH v3 5/9] bsd-user/mmap.c: mmap prefer MAP_ANON for BSD Warner Losh
2021-10-14 15:06 ` Kyle Evans
2021-10-08 21:23 ` [PATCH v3 6/9] bsd-user/mmap.c: Convert to qemu_log logging for mmap debugging Warner Losh
2021-10-09 16:01 ` Richard Henderson
2021-10-11 18:52 ` Philippe Mathieu-Daudé
2021-10-18 3:44 ` Kyle Evans
2021-10-08 21:23 ` [PATCH v3 7/9] bsd-user/mmap.c: Don't mmap fd == -1 independently from MAP_ANON flag Warner Losh
2021-10-09 16:03 ` Richard Henderson
2021-10-18 3:43 ` Kyle Evans
2021-10-08 21:23 ` [PATCH v3 8/9] bsd-user/mmap.c: Implement MAP_EXCL, required by jemalloc in head Warner Losh
2021-10-09 16:04 ` Richard Henderson
2021-10-08 21:23 ` [PATCH v3 9/9] bsd-user/mmap.c: assert that target_mprotect cannot fail Warner Losh
2021-10-14 15:13 ` Kyle Evans
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACNAnaFe0+vX5kkdwyk9Of5j+1SphCRAA3brpuWjfLqn=ubf8g@mail.gmail.com' \
--to=kevans@freebsd.org \
--cc=f4bug@amsat.org \
--cc=imp@bsdimp.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.