blob: 4691a3672a475f142dd22ab9da25502ba6aec6b8 [file] [log] [blame]
Andrew Geissler9aee5002022-03-30 16:27:02 +00001From 444e80e63d35006f41e7d658e2bf6d7c9f7641df Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 21 Mar 2022 10:09:38 -0700
4Subject: [PATCH] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
5 systems
6
7linux only wires MAP_SYNC and MAP_SHARED_VALIDATE for architectures
8which include asm-generic/mman.h and mips/powerpc are not including this
9file in linux/mman.h, therefore these should be defined for such
10architectures on Linux as well. This fixes build on mips/musl/linux
11
12Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/qemu-devel/2022-03/msg05298.html]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Cc: Zhang Yi <yi.z.zhang@linux.intel.com>
15Cc: Michael S. Tsirkin <mst@redhat.com>
16---
17 util/mmap-alloc.c | 10 +++++++---
18 1 file changed, 7 insertions(+), 3 deletions(-)
19
20diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
21index 893d864354..86d3cda248 100644
22--- a/util/mmap-alloc.c
23+++ b/util/mmap-alloc.c
24@@ -10,14 +10,18 @@
25 * later. See the COPYING file in the top-level directory.
26 */
27
28+#include "qemu/osdep.h"
29 #ifdef CONFIG_LINUX
30 #include <linux/mman.h>
31-#else /* !CONFIG_LINUX */
32+#endif /* CONFIG_LINUX */
33+
34+#ifndef MAP_SYNC
35 #define MAP_SYNC 0x0
36+#endif /* MAP_SYNC */
37+#ifndef MAP_SHARED_VALIDATE
38 #define MAP_SHARED_VALIDATE 0x0
39-#endif /* CONFIG_LINUX */
40+#endif /* MAP_SHARED_VALIDATE */
41
42-#include "qemu/osdep.h"
43 #include "qemu/mmap-alloc.h"
44 #include "qemu/host-utils.h"
45 #include "qemu/cutils.h"
46--
472.35.1
48