diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2018-03-10 00:02:33 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-03-10 14:42:52 +0100 |
| commit | 3917349ea55c500af30c063e29fa66ee08b42312 (patch) | |
| tree | a6abd37bf3601bb579205b28c0e798c080d2b7bd | |
| parent | a229b8d95e2befb747435297452630bc73ff7755 (diff) | |
| download | ptxdist-3917349ea55c500af30c063e29fa66ee08b42312.tar.gz ptxdist-3917349ea55c500af30c063e29fa66ee08b42312.tar.xz | |
qemu: add upstream patch
With recent glibc versions building fails with:
[...]/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
Add upstream patch to fix this.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
[mol: fixed commit message]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch | 53 | ||||
| -rw-r--r-- | patches/qemu-2.10.1/series | 3 |
2 files changed, 55 insertions, 1 deletions
diff --git a/patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch b/patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch new file mode 100644 index 000000000..760bb977c --- /dev/null +++ b/patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch @@ -0,0 +1,53 @@ +From: Paolo Bonzini <pbonzini@redhat.com> +Date: Tue, 28 Nov 2017 10:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +memfd: fix configure test + +Recent glibc added memfd_create in sys/mman.h. This conflicts with +the definition in util/memfd.c: + + /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration + +Fix the configure test, and remove the sys/memfd.h inclusion since the +file actually does not exist---it is a typo in the memfd_create(2) man +page. + +Cc: Marc-André Lureau <marcandre.lureau@redhat.com> +Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index dd73cce62f9d..53581d787dac 100755 +--- a/configure ++++ b/configure +@@ -3855,7 +3855,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include <sys/memfd.h> ++#include <sys/mman.h> + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba866..412e94a405fc 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include <sys/memfd.h> +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include <sys/syscall.h> + #include <asm/unistd.h> + diff --git a/patches/qemu-2.10.1/series b/patches/qemu-2.10.1/series index a7c01fc72..4d4c6e57e 100644 --- a/patches/qemu-2.10.1/series +++ b/patches/qemu-2.10.1/series @@ -2,4 +2,5 @@ #tag:base --start-number 1 0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch 0002-hw-sd-fix-out-of-bounds-check-for-multi-block-reads.patch -# a611a3e7e527ebbc7ad1f11615b7ac7d - git-ptx-patches magic +0003-memfd-fix-configure-test.patch +# ae7f94af2198ed5ebb1e8182429e973d - git-ptx-patches magic |