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

68168cacffe62e2a6fbfea9bee1683'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-graph.sh'>
<input type='hidden' name='id' value='0be4d0947968168cacffe62e2a6fbfea9bee1683'/><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=0be4d0947968168cacffe62e2a6fbfea9bee1683'>root</a>/<a href='/guix/log/tests?id=0be4d0947968168cacffe62e2a6fbfea9bee1683'>tests</a>/<a href='/guix/log/tests/guix-graph.sh?id=0be4d0947968168cacffe62e2a6fbfea9bee1683'>guix-graph.sh</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/tests/guix-graph.sh?id=0be4d0947968168cacffe62e2a6fbfea9bee1683&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-01-16 23:56:56 +0100'>2022-01-16</span></td><td><a href='/guix/commit/tests/guix-graph.sh?id=a1037aa87b39d4c774fe398fc97a58bafeb063d1'>tests: Clean up after 'tests/guix-graph.sh'.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes a regression introduced in
a773c3142dd168e1c4480614d3f5fd9d003954cd, which would lead the first
'trap' to be ignored, thereby leaving 't-guix-graph-*' directories
behind it.

* tests/guix-graph.sh: Remove first 'trap' line that had no effect;
replace second 'trap' line.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-28 21:06:36 -0500'>2020-09-28</span></td><td><a href='/guix/commit/tests/guix-graph.sh?id=d8934360d2453a403b5433e71d09188e4ed23b57'>tests: Simplify shell exit status negation;</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-lint.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh: Use the shell '!' keyword to negate command exit status
in place of 'if ...; then false; else true; fi'
</span></span></td><td>Eric Bavier</td></tr>