summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-19 15:59:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-04 10:06:48 (GMT)
commitb6794d2f5ad3ef1acfaeaed8b849cb00da22a2f8 (patch)
tree44d4d03106a18ad18a5315d525815dd62381b7e7
parent736ef9be76e46d3e2a4d26155629e87420dde3ca (diff)
downloadpoky-b6794d2f5ad3ef1acfaeaed8b849cb00da22a2f8.tar.gz
qemu: fix memfd_create with glibc 2.27
glibc 2.27 has added memfd_create() but this conflicts with a copy in qemu, so take a patch from upstream to fix building with glibc 2.27. (From OE-Core rev: 8e6672055e804a0828e2f51fae9cbac81e4e834d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu/memfd.patch57
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.8.0.bb1
2 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/memfd.patch b/meta/recipes-devtools/qemu/qemu/memfd.patch
new file mode 100644
index 0000000..62e8d38
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/memfd.patch
@@ -0,0 +1,57 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
5From: Paolo Bonzini <pbonzini@redhat.com>
6Date: Tue, 28 Nov 2017 11:51:27 +0100
7Subject: [PATCH] memfd: fix configure test
8MIME-Version: 1.0
9Content-Type: text/plain; charset=UTF-8
10Content-Transfer-Encoding: 8bit
11
12Recent glibc added memfd_create in sys/mman.h. This conflicts with
13the definition in util/memfd.c:
14
15 /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
16
17Fix the configure test, and remove the sys/memfd.h inclusion since the
18file actually does not exist---it is a typo in the memfd_create(2) man
19page.
20
21Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
22Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
23---
24 configure | 2 +-
25 util/memfd.c | 4 +---
26 2 files changed, 2 insertions(+), 4 deletions(-)
27
28diff --git a/configure b/configure
29index 9c8aa5a98b..99ccc1725a 100755
30--- a/configure
31+++ b/configure
32@@ -3923,7 +3923,7 @@ fi
33 # check if memfd is supported
34 memfd=no
35 cat > $TMPC << EOF
36-#include <sys/memfd.h>
37+#include <sys/mman.h>
38
39 int main(void)
40 {
41diff --git a/util/memfd.c b/util/memfd.c
42index 4571d1aba8..412e94a405 100644
43--- a/util/memfd.c
44+++ b/util/memfd.c
45@@ -31,9 +31,7 @@
46
47 #include "qemu/memfd.h"
48
49-#ifdef CONFIG_MEMFD
50-#include <sys/memfd.h>
51-#elif defined CONFIG_LINUX
52+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
53 #include <sys/syscall.h>
54 #include <asm/unistd.h>
55
56--
572.11.0
diff --git a/meta/recipes-devtools/qemu/qemu_2.8.0.bb b/meta/recipes-devtools/qemu/qemu_2.8.0.bb
index fa70009..41014f1 100644
--- a/meta/recipes-devtools/qemu/qemu_2.8.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.8.0.bb
@@ -31,6 +31,7 @@ SRC_URI += " \
31 file://0004-Add-support-for-VM-suspend-resume-for-TPM-TIS.patch \ 31 file://0004-Add-support-for-VM-suspend-resume-for-TPM-TIS.patch \
32 file://CVE-2016-9908.patch \ 32 file://CVE-2016-9908.patch \
33 file://CVE-2016-9912.patch \ 33 file://CVE-2016-9912.patch \
34 file://memfd.patch \
34" 35"
35 36
36SRC_URI_append_class-native = " \ 37SRC_URI_append_class-native = " \