diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-03-21 10:34:21 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-23 12:13:50 +0000 |
commit | 9f29bfbe9078ab41b6e2c4a0f79000316c3a0a09 (patch) | |
tree | 2e68f82f9917bf1c0821b158c0e1894686902c9b | |
parent | a2b1bfd957e7df8ddf167f46bb1e9d573f4761e5 (diff) | |
download | poky-9f29bfbe9078ab41b6e2c4a0f79000316c3a0a09.tar.gz |
qemu: Fix build on systems without MAP_SYNC
some architectures like ppc/mips do not wire this in kernel since
linux/mman.h for these architectures do not use asm-generic/mman.h
(From OE-Core rev: 442fa3d9eeae100bfa97002c97671d4b540048ed)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0001-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch | 48 |
2 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index de3320aef3..78aea71cc0 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -29,6 +29,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
29 | file://0001-riscv-Set-5.4-as-minimum-kernel-version-for-riscv32.patch \ | 29 | file://0001-riscv-Set-5.4-as-minimum-kernel-version-for-riscv32.patch \ |
30 | file://0001-acpi-tpm-Add-missing-device-identification-objects.patch \ | 30 | file://0001-acpi-tpm-Add-missing-device-identification-objects.patch \ |
31 | file://0001-ppc-Include-asm-ptrace.h-for-pt_regs-struct-definiti.patch \ | 31 | file://0001-ppc-Include-asm-ptrace.h-for-pt_regs-struct-definiti.patch \ |
32 | file://0001-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \ | ||
32 | " | 33 | " |
33 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 34 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
34 | 35 | ||
diff --git a/meta/recipes-devtools/qemu/qemu/0001-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch b/meta/recipes-devtools/qemu/qemu/0001-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch new file mode 100644 index 0000000000..4691a3672a --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0001-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 444e80e63d35006f41e7d658e2bf6d7c9f7641df Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 21 Mar 2022 10:09:38 -0700 | ||
4 | Subject: [PATCH] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux | ||
5 | systems | ||
6 | |||
7 | linux only wires MAP_SYNC and MAP_SHARED_VALIDATE for architectures | ||
8 | which include asm-generic/mman.h and mips/powerpc are not including this | ||
9 | file in linux/mman.h, therefore these should be defined for such | ||
10 | architectures on Linux as well. This fixes build on mips/musl/linux | ||
11 | |||
12 | Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/qemu-devel/2022-03/msg05298.html] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | Cc: Zhang Yi <yi.z.zhang@linux.intel.com> | ||
15 | Cc: Michael S. Tsirkin <mst@redhat.com> | ||
16 | --- | ||
17 | util/mmap-alloc.c | 10 +++++++--- | ||
18 | 1 file changed, 7 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c | ||
21 | index 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 | -- | ||
47 | 2.35.1 | ||
48 | |||