[Xen-changelog] [qemu-xen stable-4.9] memfd: fix configure test

[patchbot@xxxxxxx]

commit 6511713c340c39809fcb6271a487874633939875
Author:     Paolo Bonzini <pbonzini@xxxxxxxxxx>
AuthorDate: Tue Nov 28 11:51:27 2017 +0100
Commit:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
CommitDate: Mon Jul 9 12:37:55 2018 +0100

    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@xxxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    (cherry picked from commit 75e5b70e6b5dcc4f2219992d7cffa462aa406af0)
---
 configure    | 2 +-
 util/memfd.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 476210b1b9..fbad5cb31d 100755
--- a/configure
+++ b/configure
@@ -3702,7 +3702,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 4571d1aba8..412e94a405 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>
 
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.9

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog