From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: reinoud@netbsd.org, riastradh@netbsd.org, ryoon@netbsd.org,
jrtc27@jrtc27.com, Warner Losh <imp@bsdimp.com>,
kevans@freebsd.org, Brad Smith <brad@comstyle.com>
Subject: [PATCH 02/16] bsd-user: Ifdef a few MAP_ constants for NetBSD
Date: Wed, 5 Apr 2023 15:35:58 -0600 [thread overview]
Message-ID: <20230405213612.15942-3-imp@bsdimp.com> (raw)
In-Reply-To: <20230405213612.15942-1-imp@bsdimp.com>
MAP_GUARD, MAP_EXCL, and MAP_NOCORE are FreeBSD only. Add back the
ifdefs that I removed in 36d5d891559f (but only these ifdefs, the
rest of the commit is not reverted).
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/mmap.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index d6c5a344c9b..f732a6f6f2b 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -416,27 +416,33 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
qemu_log("MAP_ALIGNED(%u) ",
(flags & MAP_ALIGNMENT_MASK) >> MAP_ALIGNMENT_SHIFT);
}
+#ifdef MAP_GUARD
if (flags & MAP_GUARD) {
qemu_log("MAP_GUARD ");
}
+#endif
if (flags & MAP_FIXED) {
qemu_log("MAP_FIXED ");
}
if (flags & MAP_ANON) {
qemu_log("MAP_ANON ");
}
+#ifdef MAP_EXCL
if (flags & MAP_EXCL) {
qemu_log("MAP_EXCL ");
}
+#endif
if (flags & MAP_PRIVATE) {
qemu_log("MAP_PRIVATE ");
}
if (flags & MAP_SHARED) {
qemu_log("MAP_SHARED ");
}
+#ifdef MAP_NOCORE
if (flags & MAP_NOCORE) {
qemu_log("MAP_NOCORE ");
}
+#endif
if (flags & MAP_STACK) {
qemu_log("MAP_STACK ");
}
@@ -454,6 +460,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
goto fail;
}
}
+#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 */
@@ -461,6 +468,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
errno = EINVAL;
goto fail;
}
+#endif
if (offset & ~TARGET_PAGE_MASK) {
errno = EINVAL;
@@ -608,11 +616,13 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
goto the_end;
}
+#ifdef MAP_EXCL
/* Reject the mapping if any page within the range is mapped */
if ((flags & MAP_EXCL) && page_check_range(start, len, 0) < 0) {
errno = EINVAL;
goto fail;
}
+#endif
/* handle the start of the mapping */
if (start > real_start) {
--
2.40.0
next prev parent reply other threads:[~2023-04-05 21:37 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-05 21:35 [PATCH 00/16] bsd-user 2023 Q2 first batch Warner Losh
2023-04-05 21:35 ` [PATCH 01/16] bsd-user: Make print_* public Warner Losh
2023-04-08 19:00 ` Richard Henderson
2023-04-05 21:35 ` Warner Losh [this message]
2023-04-08 19:03 ` [PATCH 02/16] bsd-user: Ifdef a few MAP_ constants for NetBSD Richard Henderson
2023-04-08 19:29 ` Warner Losh
2023-04-05 21:35 ` [PATCH 03/16] bsd-user: Cleanup style Warner Losh
2023-04-08 19:03 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 04/16] bsd-user: Move system FreeBSD call table to freebsd/os-syscall.c Warner Losh
2023-04-08 19:04 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 05/16] bsd-user: Remove NetBSD specific syscall printing Warner Losh
2023-04-08 19:04 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 06/16] bsd-user: Remove OpenBSD " Warner Losh
2023-04-08 19:05 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 07/16] bsd-user: Move system call include to os-syscall.h Warner Losh
2023-04-08 19:08 ` Richard Henderson
2023-04-10 17:12 ` Warner Losh
2023-04-10 18:57 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 08/16] bsd-user: Remove useless mmap definitions Warner Losh
2023-04-08 19:09 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 09/16] bsd-user: h2g_rusage Warner Losh
2023-04-08 19:10 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 10/16] bsd-user: Implmenet do_sysctl_kern_getprocs Warner Losh
2023-04-08 19:11 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 11/16] bsd-user: Implement do_sysctl_kern_proc_filedesc Warner Losh
2023-04-08 19:12 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 12/16] bsd-user: Implement do_sysctl_kern_proc_vmmap Warner Losh
2023-04-08 19:12 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 13/16] bsd-user: Implement sysctl kern.proc, except kern.proc.full_path Warner Losh
2023-04-08 19:13 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 14/16] bsd-user: Implment core dumps Warner Losh
2023-04-08 19:15 ` Richard Henderson
2023-04-09 5:00 ` Warner Losh
2023-04-10 17:09 ` Warner Losh
2023-04-05 21:36 ` [PATCH 15/16] bsd-user: Add SIGSYS to core dump signals Warner Losh
2023-04-08 19:15 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 16/16] bsd-user: Implement SIGSYS on arm Warner Losh
2023-04-08 19:16 ` Richard Henderson
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=20230405213612.15942-3-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=brad@comstyle.com \
--cc=jrtc27@jrtc27.com \
--cc=kevans@freebsd.org \
--cc=qemu-devel@nongnu.org \
--cc=reinoud@netbsd.org \
--cc=riastradh@netbsd.org \
--cc=ryoon@netbsd.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.