package/xen: Fix qemu-xen memfd build failure
PATCH 1/1 package/xen: Fix qemu-xen memfd build failure
Fix the QEMU memfd compile error:tools/qemu-xen/util/memfd.c:40:12: error: static declaration of 'memfd_create' follows non-static declaration
static int memfd_create(const char *name, unsigned int flags)
^~~~~~~~~~~~
that has been introduced since the Glibc 2.27 upgrade.
This just involves porting the upstream QEMU patch to the Xen QEMU tree.
This fixes:
http://autobuild.buildroot.net/results/ec7cda00e07b0c98a9a366244b67611e042e0d4b/
--- package/xen/0003-memfd-fix-configure-test.patch | 62 +++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/xen/0003-memfd-fix-configure-test.patch
package/xen/0003-memfd-fix-configure-test.patch new file +62 -0
@@ -0,0 +1,62 @@ +From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini <[email protected]> +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 <[email protected]> +Signed-off-by: Paolo Bonzini <[email protected]> +Signed-off-by: Baruch Siach <[email protected]> +[ Changes by AF: + - Port the patch to the qemu-xen tree +] +Signed-off-by: Alistair Francis <[email protected]> +--- +Upstream status: commit 75e5b70e6b5 + + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 9c8aa5a98bd4..99ccc1725ace 100755 +--- a/tools/qemu-xen/configure ++++ b/tools/qemu-xen/configure +@@ -3923,7 +3923,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/tools/qemu-xen/util/memfd.c ++++ b/tools/qemu-xen/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> + +-- +2.16.2 +
Signature · 1 line
2.7.4
PATCH 1/1 package/xen: Fix qemu-xen memfd build failure
Alistair,
Quoted 12 lines · Alistair Francis
Fix the QEMU memfd compile error:
tools/qemu-xen/util/memfd.c:40:12: error: static declaration of 'memfd_create' follows non-static declaration
static intmemfd_create(const char *name, unsigned int flags)^~~~~~~~~~~~that has been introduced since the Glibc 2.27 upgrade.
This just involves porting the upstream QEMU patch to the Xen QEMU tree.
This fixes:
http://autobuild.buildroot.net/results/ec7cda00e07b0c98a9a366244b67611e042e0d4b/
Thomas Petazzoni
AppliedPATCH 1/1 package/xen: Fix qemu-xen memfd build failure
In reply to Alistair FrancisHello,
Quoted 9 lines · Alistair Francis
Fix the QEMU memfd compile error:
tools/qemu-xen/util/memfd.c:40:12: error: static declaration of 'memfd_create' follows non-static declaration
static intmemfd_create(const char *name, unsigned int flags)^~~~~~~~~~~~that has been introduced since the Glibc 2.27 upgrade.
This just involves porting the upstream QEMU patch to the Xen QEMU tree.
Quoted 8 lines
This fixes:
http://autobuild.buildroot.net/results/ec7cda00e07b0c98a9a366244b67611e042e0d4b/Signed-off-by Alistair Francis <[email protected]>--- package/xen/0003-memfd-fix-configure-test.patch | 62 +++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/xen/0003-memfd-fix-configure-test.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com