From nobody Sun Sep 14 11:34:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583969151; cv=none; d=zohomail.com; s=zohoarc; b=R+p/xm5T0A5PdGFTv7iLO91IhkwTRO5lVXmfS9E94EvlaIGWxeTwxfhr4GW4hULx5aKu5yu8A55Isfb2Ois0WvNgnWd22u1U6on154r/oJRXy+YyVSGYMxACBlIzjCDaAWBhHtbRyHKQYTmHHwfaq9aXJ9X9NbPRVLY4KojpozA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583969151; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PZN4m+/PqtpyDtwq5UdVct/FSMkksce+UIeifqMZuiA=; b=gn9mx/6XM4AMpieuDJlsvo6CvdbaxEMKK5r8xYOAks8nVUMkq8uRw/M4WvD8I4Hvj98KiFJfyEiT3F4saVsJ6zOnV1OzrRhg8E8M5vwZBEvrwB1wEWo51VJ4SMNjVXqALvc1qSd+xyffy0JdWiU15q/JgXUWwF6Jjr606Mb+AKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583969151863626.9863272940195; Wed, 11 Mar 2020 16:25:51 -0700 (PDT) Received: from localhost ([::1]:59480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCAjX-00055y-0t for importer@patchew.org; Wed, 11 Mar 2020 19:25:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41122) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCAhf-0002fT-5i for qemu-devel@nongnu.org; Wed, 11 Mar 2020 19:23:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCAhe-0005wR-4E for qemu-devel@nongnu.org; Wed, 11 Mar 2020 19:23:55 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:55625 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCAhe-0005us-0R for qemu-devel@nongnu.org; Wed, 11 Mar 2020 19:23:54 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-411-Es2TVU5FPU2VwlhRXc3kkg-1; Wed, 11 Mar 2020 19:23:50 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 685D6800D4E; Wed, 11 Mar 2020 23:23:49 +0000 (UTC) Received: from localhost (unused-10-15-17-6.yyz.redhat.com [10.15.17.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id A488460BF1; Wed, 11 Mar 2020 23:23:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583969033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PZN4m+/PqtpyDtwq5UdVct/FSMkksce+UIeifqMZuiA=; b=TaYgiAB09kytkKAEvCgzvwEqeqrqMXjp5KDlB4gFU5uQYobkfcbSfPKa/y5wiGhkfC8av1 J8doauWGv6xcn/nIagU4BMyqDfWYMwzPPrpDZIhu+hl4+t2lADOIOdb7JUBtGPKwLfNmUt ZH7Ih3Q1gehqmrxobBOYMcePHx4eA40= X-MC-Unique: Es2TVU5FPU2VwlhRXc3kkg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] Use -isystem for linux-headers dir Date: Wed, 11 Mar 2020 19:23:41 -0400 Message-Id: <20200311232342.1614944-2-ehabkost@redhat.com> In-Reply-To: <20200311232342.1614944-1-ehabkost@redhat.com> References: <20200311232342.1614944-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, jingqi.liu@intel.com, Paolo Bonzini , jtomko@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" glibc and Linux-provided headers are known to generate macro redefinition warnings when used together. For example: and duplicate some macro definitions. We normally never see those warnings because GCC suppresses warnings generated by system headers. We carry our own copy of Linux header files, though, and this makes those warnings not be suppressed when glibc headers are included before Linux headers (e.g. if is included before ). Use -isystem instead of -I for linux-headers. This makes the compiler treat our linux-headers directory the same way it treats system-provided Linux headers, and suppress warnings generated by them. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin --- Changes v1 -> v2: * Use -isystem for $PWD/linux-headers too Reported-by: "Michael S. Tsirkin" --- Makefile.target | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.target b/Makefile.target index 2d43dc586a..934a9f7431 100644 --- a/Makefile.target +++ b/Makefile.target @@ -12,7 +12,7 @@ endif =20 $(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) ifdef CONFIG_LINUX -QEMU_CFLAGS +=3D -I../linux-headers +QEMU_CFLAGS +=3D -isystem ../linux-headers endif QEMU_CFLAGS +=3D -iquote .. -iquote $(SRC_PATH)/target/$(TARGET_BASE_ARCH)= -DNEED_CPU_H =20 diff --git a/configure b/configure index cbf864bff1..bf5bf70600 100755 --- a/configure +++ b/configure @@ -899,7 +899,7 @@ Linux) linux=3D"yes" linux_user=3D"yes" kvm=3D"yes" - QEMU_INCLUDES=3D"-I\$(SRC_PATH)/linux-headers -I$PWD/linux-headers $QEMU= _INCLUDES" + QEMU_INCLUDES=3D"-isystem \$(SRC_PATH)/linux-headers -isystem $PWD/linux= -headers $QEMU_INCLUDES" supported_os=3D"yes" libudev=3D"yes" ;; --=20 2.24.1 From nobody Sun Sep 14 11:34:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583969085; cv=none; d=zohomail.com; s=zohoarc; b=a5p6nD9AX+Xu8VBiMHYqU6YXiSqv9USHTs/CQHHBHBg2a2fWbwOkkEG0tcd4rcMSw928c7IMmH1o75X4V950nulPgw+y6lMBEZD8/ko5JZpk8dnuLnnBd/FijztXoFmN/Mkf8q+Xl9dXxHRQjk5k9HuBKNixyrSuESq/2E//HHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583969085; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Q9cJLRfMJp22tXEhZigK+/Koq8ZW68NRRENVV+qtXl8=; b=Ok5rpSsLpsqBJIO+tRpYv3AtyodAgVMQVLHSK0pIvseOfnz/iFBgFMNx74rIcAv6fPOQ8LsgMmjEWTKJIVdRQLocBTFFOpH66DJosS23rIEb4b4SZ5W6iEth70Isf+TvEhdvGOf85CMtj/U0fTIbHv36TB2saL+qJcXU3Rmz89M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583969085875833.6595033610043; Wed, 11 Mar 2020 16:24:45 -0700 (PDT) Received: from localhost ([::1]:59452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCAiS-0003WF-CW for importer@patchew.org; Wed, 11 Mar 2020 19:24:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41133) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCAhh-0002hh-6C for qemu-devel@nongnu.org; Wed, 11 Mar 2020 19:23:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCAhg-0005zp-45 for qemu-devel@nongnu.org; Wed, 11 Mar 2020 19:23:57 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:41977 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCAhg-0005yq-0Y for qemu-devel@nongnu.org; Wed, 11 Mar 2020 19:23:56 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-216-8_bIRvOXMRybUVj67Rz62g-1; Wed, 11 Mar 2020 19:23:53 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B2F99189D6C0; Wed, 11 Mar 2020 23:23:52 +0000 (UTC) Received: from localhost (unused-10-15-17-6.yyz.redhat.com [10.15.17.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE22B90519; Wed, 11 Mar 2020 23:23:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583969035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q9cJLRfMJp22tXEhZigK+/Koq8ZW68NRRENVV+qtXl8=; b=Y6jZUayCWWUrzVFO4+IbbDE3sMc31YT8nqmh/b41ygIFtWjWx25uvii6eqOfuUN/RhOI2x MMcyAiolAcHV6etqe/fVVaH9EUoL+MXu/h2g1uNG8ZTzZCQVegFSfbfpDbx0RDHRlq5C1N Wp2MOYesfHfhc5j6PpFP8JYvjgeVomc= X-MC-Unique: 8_bIRvOXMRybUVj67Rz62g-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] mmap-alloc: Include osdep.h before checking CONFIG_LINUX Date: Wed, 11 Mar 2020 19:23:42 -0400 Message-Id: <20200311232342.1614944-3-ehabkost@redhat.com> In-Reply-To: <20200311232342.1614944-1-ehabkost@redhat.com> References: <20200311232342.1614944-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, jingqi.liu@intel.com, Paolo Bonzini , jtomko@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The CONFIG_LINUX check at the top of mmap-alloc.c never worked because it was done before including osdep.h. This means MAP_SYNC and MAP_SHARED_VALIDATE would always be set to 0 at the beginning of the file. Luckily, this didn't break when using recent glibc versions (2.28+), because those macros were redefined by glibc headers. Move the CONFIG_LINUX check after the main include lines, so the CONFIG_LINUX check works and we actually include . This will make MAP_SYNC and MAP_SHARED_VALIDATE available even if the host has an older glibc version. Reported-by: Jingqi Liu Reviewed-by: Michael S. Tsirkin Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * (none) --- util/mmap-alloc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c index 27dcccd8ec..7c2ce98eb0 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -9,6 +9,9 @@ * This work is licensed under the terms of the GNU GPL, version 2 or * later. See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" +#include "qemu/mmap-alloc.h" +#include "qemu/host-utils.h" =20 #ifdef CONFIG_LINUX #include @@ -17,10 +20,6 @@ #define MAP_SHARED_VALIDATE 0x0 #endif /* CONFIG_LINUX */ =20 -#include "qemu/osdep.h" -#include "qemu/mmap-alloc.h" -#include "qemu/host-utils.h" - #define HUGETLBFS_MAGIC 0x958458f6 =20 #ifdef CONFIG_LINUX --=20 2.24.1