qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: ryoon@netbsd.org, kevans@freebsd.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>,
	riastradh@netbsd.org, brad@comstyle.com, reinoud@netbsd.org,
	jrtc27@jrtc27.com, "Daniel P. Berrangé" <berrange@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Warner Losh" <imp@bsdimp.com>,
	"Richard Henderson" <richard.henderson@linaro.org>
Subject: [PATCH v3 02/20] bsd-user: Ifdef a few MAP_ constants for NetBSD / OpenBSD.
Date: Tue, 11 Apr 2023 11:09:37 -0600	[thread overview]
Message-ID: <20230411170955.17358-3-imp@bsdimp.com> (raw)
In-Reply-To: <20230411170955.17358-1-imp@bsdimp.com>

MAP_GUARD, MAP_EXCL, and MAP_NOCORE are FreeBSD only. Define them to be
0 if they aren't defined, and rely on the compiler to optimize away
sections not relevant. Added only to the top of mmap.c since that's the
only place we need this.

Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
 bsd-user/mmap.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index d6c5a344c9b..2d91e8e8826 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -20,6 +20,20 @@
 
 #include "qemu.h"
 
+/*
+ * Not all the BSDs have all the MAP flags, so define some of them to 0 here and
+ * rely on the compiler optimizing always false conditions away.
+ */
+#ifndef MAP_GUARD
+#define MAP_GUARD 0
+#endif
+#ifndef MAP_EXCL
+#define MAP_EXCL 0
+#endif
+#ifndef MAP_NOCORE
+#define MAP_NOCORE 0
+#endif
+
 static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
 static __thread int mmap_lock_count;
 
-- 
2.40.0



  parent reply	other threads:[~2023-04-11 17:10 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-11 17:09 [PATCH v3 00/20] bsd-user 2023 Q2 first batch Warner Losh
2023-04-11 17:09 ` [PATCH v3 01/20] bsd-user: Make print_* public Warner Losh
2023-04-11 17:09 ` Warner Losh [this message]
2023-04-11 17:09 ` [PATCH v3 03/20] bsd-user: Cleanup style Warner Losh
2023-04-11 17:09 ` [PATCH v3 04/20] bsd-user: Move system FreeBSD call table to freebsd/os-syscall.c Warner Losh
2023-04-11 17:09 ` [PATCH v3 05/20] bsd-user: Remove NetBSD specific syscall printing Warner Losh
2023-04-11 17:09 ` [PATCH v3 06/20] bsd-user: Remove OpenBSD " Warner Losh
2023-04-11 17:09 ` [PATCH v3 07/20] bsd-user: Move system call include to os-syscall.h Warner Losh
2023-04-11 17:09 ` [PATCH v3 08/20] bsd-user: Remove useless mmap definitions Warner Losh
2023-04-11 17:09 ` [PATCH v3 09/20] bsd-user: h2g_rusage Warner Losh
2023-04-11 17:09 ` [PATCH v3 10/20] bsd-user: Implement do_sysctl_kern_getprocs Warner Losh
2023-04-11 17:09 ` [PATCH v3 11/20] bsd-user: Implement do_sysctl_kern_proc_filedesc Warner Losh
2023-04-11 17:09 ` [PATCH v3 12/20] bsd-user: Implement do_sysctl_kern_proc_vmmap Warner Losh
2023-04-11 17:09 ` [PATCH v3 13/20] bsd-user: Implement sysctl kern.proc, except kern.proc.full_path Warner Losh
2023-04-11 17:09 ` [PATCH v3 14/20] bsd-user: Implement core dumps Warner Losh
2023-04-11 17:09 ` [PATCH v3 15/20] bsd-user: Add SIGSYS to core dump signals Warner Losh
2023-04-11 17:09 ` [PATCH v3 16/20] bsd-user: Implement SIGSYS on arm Warner Losh
2023-04-11 17:09 ` [PATCH v3 17/20] bsd-user: Remove host-os.h Warner Losh
2023-04-11 17:09 ` [PATCH v3 18/20] bsd-user: Automatically generate syscall_nr.h Warner Losh
2023-04-12 10:10   ` Richard Henderson
2023-04-12 14:21     ` Warner Losh
2023-04-13  9:53       ` Richard Henderson
2023-04-11 17:09 ` [PATCH v3 19/20] bsd-user: remove syscall_nr.h Warner Losh
2023-04-11 17:09 ` [PATCH v3 20/20] bsd-user: Eliminate USE_ELF_CORE_DUMP Warner Losh

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=20230411170955.17358-3-imp@bsdimp.com \
    --to=imp@bsdimp.com \
    --cc=berrange@redhat.com \
    --cc=brad@comstyle.com \
    --cc=jrtc27@jrtc27.com \
    --cc=kevans@freebsd.org \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=reinoud@netbsd.org \
    --cc=riastradh@netbsd.org \
    --cc=richard.henderson@linaro.org \
    --cc=ryoon@netbsd.org \
    --cc=thuth@redhat.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).