|
@@ -0,0 +1,58 @@
|
|
|
|
+From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
|
|
|
|
+From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
+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 <marcandre.lureau@redhat.com>
|
|
|
|
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
|
|
+---
|
|
|
|
+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/configure
|
|
|
|
++++ b/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/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>
|
|
|
|
+
|
|
|
|
+--
|
|
|
|
+2.16.2
|
|
|
|
+
|