From nobody Sat Feb 7 07:01:10 2026 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=1583967158; cv=none; d=zohomail.com; s=zohoarc; b=BnsePBRm+5XNfJOqi36ngv50U4pzSnsSWPomm0GewCL2qxOHYkwYbiuThOFxMzP7ahoqMIpUUFwVXRzbQUIR4hhzrX+bGzif0WC1Zeyh++YfgiC/WG7AYwHxAxUPBROyVnCTXDxleHMDscp7fg5zqBPcjsEk8fklfDSRtnr5ZL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583967158; 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=9M+fk402aDyMTIond6ySEoZWgIvegTFPDDHFMIDsNpk=; b=aYpQxlRleL9y4odN1TAPN4idh6lW0V9m2Fgmw+nqdx8Qwjaq/sSYlgBWqQ8AvTqhJcJz5MHtWh7OoeqtFRl8NzCTZbSQQ6oY0xkX2jhCLnnnc+xfBeZvvePYFHJYZIaOhaUWlhne2BgCAuhH9/29atENjaeu2HUJzIJcEr1UNHw= 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 1583967158862925.455332819637; Wed, 11 Mar 2020 15:52:38 -0700 (PDT) Received: from localhost ([::1]:59086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCADM-0005uP-Uo for importer@patchew.org; Wed, 11 Mar 2020 18:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35554) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCACV-00058P-MK for qemu-devel@nongnu.org; Wed, 11 Mar 2020 18:51:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCACU-00019v-7O for qemu-devel@nongnu.org; Wed, 11 Mar 2020 18:51:43 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:57207 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 1jCACU-00018E-41 for qemu-devel@nongnu.org; Wed, 11 Mar 2020 18:51:42 -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-387-LQWFiLgyMqSoywHrxe0kPw-1; Wed, 11 Mar 2020 18:51:38 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A460018AB2C0; Wed, 11 Mar 2020 22:51:37 +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 024028F374; Wed, 11 Mar 2020 22:51:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583967101; 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=9M+fk402aDyMTIond6ySEoZWgIvegTFPDDHFMIDsNpk=; b=drPpIGyz1sA/cXcBisq8XG4dkC+Cx7wTp9buOweueXJqn9nhO+YKC3MHV4Rglg7urUoNzP 7z9lztTLuSEeranSqfRDpmVWWHf98wnJ/92BvqJr1fmDDHCf6PAcQpR0i31UTKUQZ/9+OZ egeGJj8iout7jj4Qe67rF6GAcfu1je4= X-MC-Unique: LQWFiLgyMqSoywHrxe0kPw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 1/2] Use -isystem for linux-headers dir Date: Wed, 11 Mar 2020 18:51:29 -0400 Message-Id: <20200311225130.1599619-2-ehabkost@redhat.com> In-Reply-To: <20200311225130.1599619-1-ehabkost@redhat.com> References: <20200311225130.1599619-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.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" 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 --- 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..04a2a7f2dd 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 -I$PWD/linux-header= s $QEMU_INCLUDES" supported_os=3D"yes" libudev=3D"yes" ;; --=20 2.24.1 From nobody Sat Feb 7 07:01:10 2026 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=1583967251; cv=none; d=zohomail.com; s=zohoarc; b=IUc8aDwlLQ0M/TD6+RIpg2i8gnEj0KRvmF8VxzNjuG5UJ5QD3nxcIek3RSUTNizx1Whk07oLtZ2p+7pBZEOdgoPaVnT+oQZV8v0/3HJcdvQDKKNas3Bs5nBYsKS/MefGieIeHZ40aSKvxOMHu3CRHsoxvWkzbs/b+MAsOb9ovqQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583967251; 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=6CeyFxpE0dbipoK5qOLRsfpJ9qo8SQO0msMtHg6OK8o=; b=DFHPR9bFDZeTZTXAXf/+cBxKh7UNmhh5p9QbVo4vIFbXZTmmR0XbJ4p/ZhegTu5Y/ggmEQzt7v2opBBvnhqefo27Sjr0X8YDM29bGpryXBzuXz/H2Wd1qKijIiSMO1W8NOyzQDj7omy74E4AIuz8y1Dhc6GBrMOCNyxSwNvoBi0= 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 1583967251499802.3675505349322; Wed, 11 Mar 2020 15:54:11 -0700 (PDT) Received: from localhost ([::1]:59124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCAEs-0008KS-LV for importer@patchew.org; Wed, 11 Mar 2020 18:54:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35575) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCACZ-00059t-8g for qemu-devel@nongnu.org; Wed, 11 Mar 2020 18:51:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCACY-0001Kb-5e for qemu-devel@nongnu.org; Wed, 11 Mar 2020 18:51:47 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:59581 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 1jCACY-0001Ix-2E for qemu-devel@nongnu.org; Wed, 11 Mar 2020 18:51:46 -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-77-PTrbyr-cPZSkR3kDPa8KTA-1; Wed, 11 Mar 2020 18:51:42 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F24FBDB60; Wed, 11 Mar 2020 22:51:40 +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 44DF35D9E5; Wed, 11 Mar 2020 22:51:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583967105; 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=6CeyFxpE0dbipoK5qOLRsfpJ9qo8SQO0msMtHg6OK8o=; b=DLmPeZ/452Cc2pFK8Nhbr4wLiNl+/8C3CuyZjn/60zKVm2UtaWtl5Jt7DGeTeFBK5ldZLg D1GXgU4f9ZfaMJHLIIdaGI+1Zs4dGHZYmxJ4jPKMC9MGjxqAq8/0Tusv0Nzlju3EVUbSTx CnArSFwXCU1+A41ZQ0wNFRzsRVk7Hwk= X-MC-Unique: PTrbyr-cPZSkR3kDPa8KTA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 2/2] mmap-alloc: Include osdep.h before checking CONFIG_LINUX Date: Wed, 11 Mar 2020 18:51:30 -0400 Message-Id: <20200311225130.1599619-3-ehabkost@redhat.com> In-Reply-To: <20200311225130.1599619-1-ehabkost@redhat.com> References: <20200311225130.1599619-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" 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 Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin --- 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