12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849 |
- From ebf4bb2f51da83af0c61480414cfa156f7308b34 Mon Sep 17 00:00:00 2001
- From: Khem Raj <raj.khem@gmail.com>
- Date: Mon, 21 Mar 2022 10:09:38 -0700
- Subject: [PATCH 09/12] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
- systems
- linux only wires MAP_SYNC and MAP_SHARED_VALIDATE for architectures
- which include asm-generic/mman.h and mips/powerpc are not including this
- file in linux/mman.h, therefore these should be defined for such
- architectures on Linux as well. This fixes build on mips/musl/linux
- Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/qemu-devel/2022-03/msg05298.html]
- Signed-off-by: Khem Raj <raj.khem@gmail.com>
- Cc: Zhang Yi <yi.z.zhang@linux.intel.com>
- Cc: Michael S. Tsirkin <mst@redhat.com>
- ---
- util/mmap-alloc.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
- diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
- index 893d86435..86d3cda24 100644
- --- a/util/mmap-alloc.c
- +++ b/util/mmap-alloc.c
- @@ -10,14 +10,18 @@
- * later. See the COPYING file in the top-level directory.
- */
-
- +#include "qemu/osdep.h"
- #ifdef CONFIG_LINUX
- #include <linux/mman.h>
- -#else /* !CONFIG_LINUX */
- +#endif /* CONFIG_LINUX */
- +
- +#ifndef MAP_SYNC
- #define MAP_SYNC 0x0
- +#endif /* MAP_SYNC */
- +#ifndef MAP_SHARED_VALIDATE
- #define MAP_SHARED_VALIDATE 0x0
- -#endif /* CONFIG_LINUX */
- +#endif /* MAP_SHARED_VALIDATE */
-
- -#include "qemu/osdep.h"
- #include "qemu/mmap-alloc.h"
- #include "qemu/host-utils.h"
- #include "qemu/cutils.h"
- --
- 2.30.2
|