From nobody Mon Feb 9 17:37:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513790279614937.3832955598734; Wed, 20 Dec 2017 09:17:59 -0800 (PST) Received: from localhost ([::1]:60333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRi04-0005eX-99 for importer@patchew.org; Wed, 20 Dec 2017 12:17:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRhxx-0004EW-Cs for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:15:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRhxv-0006wP-6d for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:15:37 -0500 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:45820) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRhxu-0006vk-Sd for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:15:35 -0500 Received: by mail-wr0-x244.google.com with SMTP id h1so22876631wre.12 for ; Wed, 20 Dec 2017 09:15:34 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-251-125.clienti.tiscali.it. [78.12.251.125]) by smtp.gmail.com with ESMTPSA id f125sm2751101wme.45.2017.12.20.09.15.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 09:15:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pSbIuouZDhWTtLy30GP+w3YNF/ziuwp3NIZfSvgHxVk=; b=MaTD90K1i5ts39nZMiEsR1uBmyIPFxas99Za+j5noS3Ej0QdtCMvtbBb0iOuXrFE61 LOnh7ntn0rboGAQHUgKCqWhenpCTtNcu7rdz+CcG9+X3Kzd1jv621HV9niyo//mcQzRw XQsgjtWjuOpwhoGNGI5kFu36dlbQ0++ljBchQlh8MbtIIxt7YpxXFdTUwq6ESAQ/MjMd Jo+ZQXTkAnm2oY52LeEyTU6FxHLjVRc6BOCGEliACZWcP9iYrXcyGkPMFY997KB/iQfm n6nLP5wdtz/mxkWEyLvt2Bc7rP8fr2wMCLki41DGp8JQ7ErGaVnBEiE05H8cCVDzDPey qZrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pSbIuouZDhWTtLy30GP+w3YNF/ziuwp3NIZfSvgHxVk=; b=Ahy1CZgYTW6NasLkriLoETNEv7ZCYJStmwPUn+kyyCQnsDvU0cZO/7gB9Pef+hPMxK KWGuWBFiq2ItW67o1Of0w4gU0dByAfyW++yksTb8zrKbM7hjjBOQNloZ1H8kgZ59SACG sS5GVPyLpyrr8odJtHjzlT2j2dAgk2QJYGkTSgObEC7ijFNE+azqdluZrWJB1kKGQpFb AM7v6D3RtnNjMo8mXwH4BC4F5RO466QFqHOZxDnvR3zopQUI7su1UJr3W7R3kUGLLd6K z3hiNvaqw75asDjwuxD53B7oy5z1VkmY1gzhTBZnoSaKMRi3HKmMtfeF64ZZGFdV7HCO ajOw== X-Gm-Message-State: AKGB3mKTLcMSYU9eyMZ3sCBQeBCm5UO0viLlL2Vl3/v+lDJn7SmQ9Zys xgsnZFzFLPRJRTv7hvf/GJrBv0e7 X-Google-Smtp-Source: ACJfBotvTBTJG0cu+4tfspz0UpVaYpp9B74Av7TnrpEjb9MbYmUl0iKvpKA2gVu3LPUGBuBZlFEdrw== X-Received: by 10.223.190.135 with SMTP id i7mr9783894wrh.184.1513790133544; Wed, 20 Dec 2017 09:15:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 20 Dec 2017 18:14:13 +0100 Message-Id: <1513790098-9815-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> References: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 01/46] memfd: fix configure test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- 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=3Dno cat > $TMPC << EOF -#include +#include =20 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 @@ =20 #include "qemu/memfd.h" =20 -#ifdef CONFIG_MEMFD -#include -#elif defined CONFIG_LINUX +#if defined CONFIG_LINUX && !defined CONFIG_MEMFD #include #include =20 --=20 1.8.3.1