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=utf8
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>
---
 configure    | 2 +-
 util/memfd.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 9c8aa5a..99ccc17 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 4571d1a..412e94a 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>
 
-- 
1.8.3.1

e852c525c67ef35'>commit</a><a href='/guix/diff/doc/images/installer-partitions.png?id=d21ddfc9d884f045afa6db581e852c525c67ef35'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/images/installer-partitions.png'>
<input type='hidden' name='id' value='d21ddfc9d884f045afa6db581e852c525c67ef35'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d21ddfc9d884f045afa6db581e852c525c67ef35'>root</a>/<a href='/guix/log/doc?id=d21ddfc9d884f045afa6db581e852c525c67ef35'>doc</a>/<a href='/guix/log/doc/images?id=d21ddfc9d884f045afa6db581e852c525c67ef35'>images</a>/<a href='/guix/log/doc/images/installer-partitions.png?id=d21ddfc9d884f045afa6db581e852c525c67ef35'>installer-partitions.png</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/doc/images/installer-partitions.png?id=d21ddfc9d884f045afa6db581e852c525c67ef35&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
span></td><td><a href='/guix/commit/README?id=503d2bfde08f9bf97bbf430516d2f19faedd4319'>README: Refer to the manual for building from Git.</a><span class='msg-avail'>...<span class='msg-tooltip'>* README (Installing Guix from Guix): Remove section.
(Installation): For installing from Git, refer to the "Building from Git"
section of the manual and suggest using './pre-inst-env guix pull' rather than
'make install' for installing Guix.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-06-02 18:55:53 +0200'>2020-06-02</span></td><td><a href='/guix/commit/README?id=c75a80189fc19f6ff8b4c82d1d1801be6763b6d2'>doc: Update README to refer to the manual.</a><span class='msg-avail'>...<span class='msg-tooltip'>* README (Requirements): Refer to the manual.
(Installation): Update URL of the manual.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-11-09 23:04:14 +0100'>2019-11-09</span></td><td><a href='/guix/commit/README?id=0758a70cc008171f31c848128deca9803536fe60'>doc: Mention value /var to localstatedir option.</a><span class='msg-avail'>...<span class='msg-tooltip'>* README (Installing Guix from Guix): Mention value /var to localstatedir option.
* doc/contributing.texi (Building from Git): Likewise.
* doc/guix.texi (Requirements): Likewise.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>zimoun</td></tr>
<tr><td><span title='2019-09-04 23:41:07 +0200'>2019-09-04</span></td><td><a href='/guix/commit/README?id=f475c6e53e5b6912cc45663d50f1d03dadfb60b8'>doc: Update 'README'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* README: Update intro a bit.
(Installing Guix as non-root): Remove as it's largely outdated.
(Contact): Update.
</span></span></td><td>Ludovic Courtès</td></tr>