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

a0629b4f019c8cf89cde08be'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/sddm.scm'>
<input type='hidden' name='id' value='006679d1e6ca7acea0629b4f019c8cf89cde08be'/><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=006679d1e6ca7acea0629b4f019c8cf89cde08be'>root</a>/<a href='/guix/log/gnu?id=006679d1e6ca7acea0629b4f019c8cf89cde08be'>gnu</a>/<a href='/guix/log/gnu/tests?id=006679d1e6ca7acea0629b4f019c8cf89cde08be'>tests</a>/<a href='/guix/log/gnu/tests/sddm.scm?id=006679d1e6ca7acea0629b4f019c8cf89cde08be'>sddm.scm</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/gnu/tests/sddm.scm?id=006679d1e6ca7acea0629b4f019c8cf89cde08be&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-11-25 11:22:12 +0100'>2024-11-25</span></td><td><a href='/guix/commit/gnu/tests/sddm.scm?id=4978e36866748c050ad11c4731242d6686909fff'>tests: sddm: Update expected message on login screen.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/sddm.scm (run-sddm-test)["login screen up"]: Change expected
message to match current SDDM version.

Change-Id: Ib59478685b87b8080e27d2aee367c709cbcd0906
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-04-15 09:52:44 +0100'>2024-04-15</span></td><td><a href='/guix/commit/gnu/tests/sddm.scm?id=027419626f171cdccf9c4a77686840141ea502eb'>gnu: tests: Add system test for sddm.</a><span class='msg-avail'>...<span class='msg-tooltip'>Create a basic suite of tests to verify the display manager starts.

* gnu/tests/sddm.scm: New file.

Change-Id: Ia84926e9aab42c6781430c22aae0f892387d1a29
Signed-off-by: Christopher Baines &lt;mail@cbaines.net&gt;
</span></span></td><td>Richard Sent</td></tr>