[qemu-xen master] memfd: fix configure test

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[qemu-xen master] memfd: fix configure test

patchbot
commit 5c3fdee026a204a59cb392e43a313ab558de9682
Author:     Paolo Bonzini <[hidden email]>
AuthorDate: Tue Nov 28 11:51:27 2017 +0100
Commit:     Anthony PERARD <[hidden email]>
CommitDate: Fri Mar 9 11:44:25 2018 +0000

    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 <[hidden email]>
    Signed-off-by: Paolo Bonzini <[hidden email]>
    (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 0c6e7572db..087a82ac50 100755
--- a/configure
+++ b/configure
@@ -3920,7 +3920,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#master


_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog