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

f/po/doc/guix-cookbook.ko.po?id=bf7813a9d47f22ff0bc30c29c21cfc327ba002eb'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/po/doc/guix-cookbook.ko.po'>
<input type='hidden' name='id' value='bf7813a9d47f22ff0bc30c29c21cfc327ba002eb'/><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=bf7813a9d47f22ff0bc30c29c21cfc327ba002eb'>root</a>/<a href='/guix/log/po?id=bf7813a9d47f22ff0bc30c29c21cfc327ba002eb'>po</a>/<a href='/guix/log/po/doc?id=bf7813a9d47f22ff0bc30c29c21cfc327ba002eb'>doc</a>/<a href='/guix/log/po/doc/guix-cookbook.ko.po?id=bf7813a9d47f22ff0bc30c29c21cfc327ba002eb'>guix-cookbook.ko.po</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/po/doc/guix-cookbook.ko.po?id=bf7813a9d47f22ff0bc30c29c21cfc327ba002eb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-11-01 02:39:13 +0100'>2024-11-01</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.ko.po?id=dd63cd7876f8c6a6eb42170219c17659ff4daf42'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>Change-Id: I15d674cd8e88250daa4284e8137a808c5298548f
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2024-10-01 00:47:02 +0200'>2024-10-01</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.ko.po?id=25ff62e2501badd10c55e81ef2e8655fb8f85177'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>Change-Id: Ic1f7216e35c17c3de07a5e56ce582c236dadafcd
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2024-06-03 00:27:12 +0200'>2024-06-03</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.ko.po?id=834a4195241806784d4b321b95f06d85f458ce18'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.sv.po: New file.
* po/doc/local.mk: Add 'sv' cookbook.
* po/doc/po4a.cfg (po4a_langs): Add 'sv'.
* doc/local.mk: Add 'sv' cookbook.
* doc/htmlxref.cnf: Update URLs for cookbook.
* doc/build.scm (%cookbook-languages): Add 'sv'.
* doc/guix-cookbook.texi (Top): Mention 'sv' cookbook.

Change-Id: Ibfeb7254f583f1c8827e8c2756bbb02880bcba46
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2023-06-30 14:26:07 +0200'>2023-06-30</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.ko.po?id=8af22b493199a17f46351c2f3d9f6ee759e48564'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/ja.po: New file.
* po/packages/LINGUAS: Add it.
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2023-05-31 17:23:21 +0200'>2023-05-31</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.ko.po?id=8e9e6a6482f3ba98d1cdcad344ee488e8751fee7'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix-cookbook.texi (Top): Mention Slovak.
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2023-03-07 21:14:57 +0100'>2023-03-07</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.ko.po?id=d333958763b0840c4cd895601b079b68358a6a46'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>