From nobody Thu May 2 10:27:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605719638; cv=none; d=zohomail.com; s=zohoarc; b=iOTFa88M7kW0bCp17qRk8WqQHR/opnh7TsisK4nYb42bZnc1DSN/XlRs+gKbByL78q/Dg6mADXdJm7QUHy66UCdjCRrKMDThml38mOxaFaaA/PJB95Bp3yi+81Q9WH0/GMxlS3fbb/AefK1TAXZ5n4r00flhFEXJ0VNW90To8DI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605719638; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=0/nIBpoeA+ZXOrJjzGLqNxrNPozNurteKJgZoaNK2V4=; b=HLb9CE+ZaFbIO/pQTmZC/E35svfBHb0elvEEqzVn8EjxxhM2/C39sXeqOPsCtVYUaGLqrw1z5SkmK7LVKCUlZicWvbW5nQ3gyF0v9Dm92yDB7E1OZXFmhe7+qwqHiT9ku0Bex36lynduY/N8XmuilWP9WqL1ejlpLclsvhXJfAM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1605719638162852.7671080699968; Wed, 18 Nov 2020 09:13:58 -0800 (PST) Received: from localhost ([::1]:38768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfR1o-00023V-W1 for importer@patchew.org; Wed, 18 Nov 2020 12:13:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfQz3-0007i5-W7 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfQz0-000131-D0 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:05 -0500 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-460-wHRvNz9UN-yCeCQ7A89C9A-1; Wed, 18 Nov 2020 12:10:58 -0500 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 955F318B9EC8; Wed, 18 Nov 2020 17:10:57 +0000 (UTC) Received: from thuth.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8799E60BE2; Wed, 18 Nov 2020 17:10:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605719460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=0/nIBpoeA+ZXOrJjzGLqNxrNPozNurteKJgZoaNK2V4=; b=dRZ5KS9ZBOAMPG0eilptaQty6TzG+SuQVOWn50BCgoxQtMuHANm0aTaQdqKdQ4IrozvZUr V2Iaa7tzlpaKxPHf+YTkMCeKSqT2STGp6TNIeQvdUvZdk8RUZs6SERyIOuZ4dqMOKHUN8O MB5C8xtR3vnF/53xG68SjI6FRgmnv+Q= X-MC-Unique: wHRvNz9UN-yCeCQ7A89C9A-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 1/6] configure: Remove the obsolete check for ifaddrs.h Date: Wed, 18 Nov 2020 18:10:47 +0100 Message-Id: <20201118171052.308191-2-thuth@redhat.com> In-Reply-To: <20201118171052.308191-1-thuth@redhat.com> References: <20201118171052.308191-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 19:41:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The code that used HAVE_IFADDRS_H has been removed in commit 0a27af918b ("io: use bind() to check for IPv4/6 availability"), so we don't need this check in the configure script anymore. Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson --- configure | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/configure b/configure index 714e75b5d8..6c8f56c514 100755 --- a/configure +++ b/configure @@ -3094,14 +3094,6 @@ EOF fi fi =20 -########################################## -# getifaddrs (for tests/test-io-channel-socket ) - -have_ifaddrs_h=3Dyes -if ! check_include "ifaddrs.h" ; then - have_ifaddrs_h=3Dno -fi - ######################################### # libdrm check have_drm_h=3Dno @@ -6199,9 +6191,6 @@ fi if test "$auth_pam" =3D "yes" ; then echo "CONFIG_AUTH_PAM=3Dy" >> $config_host_mak fi -if test "$have_ifaddrs_h" =3D "yes" ; then - echo "HAVE_IFADDRS_H=3Dy" >> $config_host_mak -fi if test "$have_drm_h" =3D "yes" ; then echo "HAVE_DRM_H=3Dy" >> $config_host_mak fi --=20 2.18.4 From nobody Thu May 2 10:27:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605720339; cv=none; d=zohomail.com; s=zohoarc; b=oBmTh3GPt+0YR0SdUbNx4dgKO9li9aEIA4aHWzWZuDEh20DdajgcoO3Jp3RhjNOjQuQL8tw6fwlOgPrYeH5hREYLSgYFisg75FTpTMDMlt18PQtGT0V3x9DxGz9hCD3hN+Yx8O5Ut+O5AKHmVG7cIqHZzB2KoT2Lgd/Ssv7Wtuc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605720339; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=FTDA73UTegjC9rSYMTHQISsLG7qT+WXadfriXvhyikA=; b=LPJbePx+mb7XudAqCHSNGIuymcM/yGrW5bBJ48tmRUewi+zZbALggWqftm0MAAMxO7XaERNRGR/Ldqq5n8AGRoRsAeDRACFbgBDP/SVD+NwATR43aiAX4icTyGDTKgH1j4zJxAQ6ulOXFSJbKdI09QOVXvdnmplTUYlbcOsTW3U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1605720339200853.8973521952078; Wed, 18 Nov 2020 09:25:39 -0800 (PST) Received: from localhost ([::1]:33518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfRD7-0003lP-Qj for importer@patchew.org; Wed, 18 Nov 2020 12:25:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfQz7-0007kK-Qu for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22343) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfQz5-00014Q-2H for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:09 -0500 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-130-ewyMxDZlORmmwIc49GH9zA-1; Wed, 18 Nov 2020 12:11:00 -0500 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 F2209D8EC5; Wed, 18 Nov 2020 17:10:58 +0000 (UTC) Received: from thuth.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id F158D60BE2; Wed, 18 Nov 2020 17:10:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605719465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=FTDA73UTegjC9rSYMTHQISsLG7qT+WXadfriXvhyikA=; b=I2OXzZhFbHOjBqZpXOdnZA/WZP7LX5VOxouYOsjSKaMv37GV+GxreBOTHTOWmiP+f4Bccj mIQSBjSi2GPe2zQ8qzBl+B+CISBUpnVgboaeNHQwvS53mqU7ciMs5lTT8YTcqxYqybVbLD MdvgGgB8Xc0mO+sUXqcznkRKTnqRCro= X-MC-Unique: ewyMxDZlORmmwIc49GH9zA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 2/6] configure / meson: Move check for pty.h to meson.build Date: Wed, 18 Nov 2020 18:10:48 +0100 Message-Id: <20201118171052.308191-3-thuth@redhat.com> In-Reply-To: <20201118171052.308191-1-thuth@redhat.com> References: <20201118171052.308191-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 19:41:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This check can be done in a much shorter way in meson.build Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- configure | 9 --------- meson.build | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/configure b/configure index 6c8f56c514..5a5e486373 100755 --- a/configure +++ b/configure @@ -2319,12 +2319,6 @@ else l2tpv3=3Dno fi =20 -if check_include "pty.h" ; then - pty_h=3Dyes -else - pty_h=3Dno -fi - cat > $TMPC < int main(int argc, char *argv[]) { @@ -6667,9 +6661,6 @@ if test "$sheepdog" =3D "yes" ; then add_to deprecated_features "sheepdog" echo "CONFIG_SHEEPDOG=3Dy" >> $config_host_mak fi -if test "$pty_h" =3D "yes" ; then - echo "HAVE_PTY_H=3Dy" >> $config_host_mak -fi if test "$have_mlockall" =3D "yes" ; then echo "HAVE_MLOCKALL=3Dy" >> $config_host_mak fi diff --git a/meson.build b/meson.build index 7ddf983ff7..97a6445249 100644 --- a/meson.build +++ b/meson.build @@ -808,6 +808,7 @@ config_host_data.set('QEMU_VERSION_MAJOR', meson.projec= t_version().split('.')[0] config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('= .')[2]) =20 +config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h')) config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) =20 ignored =3D ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target --=20 2.18.4 From nobody Thu May 2 10:27:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605719757; cv=none; d=zohomail.com; s=zohoarc; b=lUbbgL7rF0apLZewukDZruykm0JjSr2qF1XGDBkenkNsq0wsf2tQ/j2VTalC7QAqmAf/aMWsiK2D1h50OS1LO12RYj0o3E94xqp9KEBLPTvqIH0TXQx/0kMaD+qxkm9NnId/ytyjdLm7iIGZ12AJZy0ND5Y5FqNju7M77bENYC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605719757; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=VjP7aOMy74tVk7b997ykXQsbMJNZFefXpBSJqDAoVHk=; b=ImYCVCOxHuV91wrdrunWfRTe4fmWDu/qIdNRXph03tA1rKJMmv2/eHpXDcb0Du1Tsm3DzcB4C8Ms52GN6Ypcc8QBTTCd/cqjmuXtqrvM/VVM6ZVEvqghasOaMFW8S9STRCwPXFGD8Kg3Qmk4M6FQZEQ2/HI48+TE2oAr/LHd8+w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1605719757316292.26399240852527; Wed, 18 Nov 2020 09:15:57 -0800 (PST) Received: from localhost ([::1]:44486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfR3j-0004SZ-4A for importer@patchew.org; Wed, 18 Nov 2020 12:15:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfQz5-0007jD-V4 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfQz4-00014L-65 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:07 -0500 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-123-U3g6l2quO5CG5JKJYvFjXQ-1; Wed, 18 Nov 2020 12:11:01 -0500 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 731CDD8EC1; Wed, 18 Nov 2020 17:11:00 +0000 (UTC) Received: from thuth.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6995960BE2; Wed, 18 Nov 2020 17:10:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605719465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=VjP7aOMy74tVk7b997ykXQsbMJNZFefXpBSJqDAoVHk=; b=MfFtxNAjsFvrSXnpIAGyFF3ic8swyDB5rmA09M2ClnYiyszI101sbf+L8QbdUtGsdM6rxC IjG6/FKAi6/UWjjSnIN9yeoeRLR3UwszLye3SwReIqa/yfCyFddHRwCxNlDXj0CpybaUzp WBtG2XmXNinDGttb+UDK02ay5umXuvE= X-MC-Unique: U3g6l2quO5CG5JKJYvFjXQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 3/6] configure / meson: Move check for drm.h to meson.build Date: Wed, 18 Nov 2020 18:10:49 +0100 Message-Id: <20201118171052.308191-4-thuth@redhat.com> In-Reply-To: <20201118171052.308191-1-thuth@redhat.com> References: <20201118171052.308191-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 00:38:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This check can be done in a much shorter way in meson.build Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- configure | 10 ---------- meson.build | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configure b/configure index 5a5e486373..b3e1052a58 100755 --- a/configure +++ b/configure @@ -3088,13 +3088,6 @@ EOF fi fi =20 -######################################### -# libdrm check -have_drm_h=3Dno -if check_include "libdrm/drm.h" ; then - have_drm_h=3Dyes -fi - ######################################### # sys/signal.h check have_sys_signal_h=3Dno @@ -6185,9 +6178,6 @@ fi if test "$auth_pam" =3D "yes" ; then echo "CONFIG_AUTH_PAM=3Dy" >> $config_host_mak fi -if test "$have_drm_h" =3D "yes" ; then - echo "HAVE_DRM_H=3Dy" >> $config_host_mak -fi if test "$have_broken_size_max" =3D "yes" ; then echo "HAVE_BROKEN_SIZE_MAX=3Dy" >> $config_host_mak fi diff --git a/meson.build b/meson.build index 97a6445249..d6b633f17f 100644 --- a/meson.build +++ b/meson.build @@ -808,6 +808,7 @@ config_host_data.set('QEMU_VERSION_MAJOR', meson.projec= t_version().split('.')[0] config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('= .')[2]) =20 +config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h')) config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h')) config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) =20 --=20 2.18.4 From nobody Thu May 2 10:27:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605719589; cv=none; d=zohomail.com; s=zohoarc; b=cw3/p5Y7HDjlciSrFthdtmOfqMCA/Yswuqi5QJs8WGW71ENDUo7xKRT2HB7suqpht3sAbzDGVTDSFoJjey5CEdlHJuCCiylpHSzxhJmtVTolVYbY7NnzHwpT5P6iT3J3DF9Lc0GZaOwvcRC7UGcOUB1q/gzX9DCW3NdeJlgGHHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605719589; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=hzTqlCopfskY/C/DoivX3/fD2nAfwv/Qk/FX25myFsA=; b=NAvOcQkERZgaXgAaLWnq+12o4g1vLZ6vmoci79wSjcP4PfBfSJq8eWvwT05C5+TVsVBO9lFmBbbuYkGtb4iMdhGwJQ+cz8My11AoSOLmhUTRVSLfAhPjMGPvBKnbLlOMvJoDetNiwurUYGVDzxCuDzkDyoyBaHuggw80mcv2GQU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1605719589551891.5510168386182; Wed, 18 Nov 2020 09:13:09 -0800 (PST) Received: from localhost ([::1]:36692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfR12-0001CG-87 for importer@patchew.org; Wed, 18 Nov 2020 12:13:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfQz8-0007lh-T4 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46822) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfQz5-00014W-35 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:10 -0500 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-279-248EXUP9PIWKn42CBlMFFw-1; Wed, 18 Nov 2020 12:11:03 -0500 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 02707D8EC2; Wed, 18 Nov 2020 17:11:02 +0000 (UTC) Received: from thuth.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id D136F60BE2; Wed, 18 Nov 2020 17:11:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605719465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=hzTqlCopfskY/C/DoivX3/fD2nAfwv/Qk/FX25myFsA=; b=W2bOeZJjN45MhdGy9uSJojOtqPOLEDPsa809RHXp3aBnB1pLaIPI9tYWJ9FTYmIkB7bodi 0QwH7nH8pYpXo/dTexO65fcOf0fUjYNG8UBtSakkuotYyzu3ZXXgP0A3mI6vGMsVCdhyTj Ae439t/uUmYx2ueo+6dEsJlf8jpOS80= X-MC-Unique: 248EXUP9PIWKn42CBlMFFw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 4/6] configure / meson: Move check for sys/signal.h to meson.build Date: Wed, 18 Nov 2020 18:10:50 +0100 Message-Id: <20201118171052.308191-5-thuth@redhat.com> In-Reply-To: <20201118171052.308191-1-thuth@redhat.com> References: <20201118171052.308191-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 00:38:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This check can be done in a much shorter way in meson.build Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- configure | 10 ---------- meson.build | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configure b/configure index b3e1052a58..871e4bb9fb 100755 --- a/configure +++ b/configure @@ -3088,13 +3088,6 @@ EOF fi fi =20 -######################################### -# sys/signal.h check -have_sys_signal_h=3Dno -if check_include "sys/signal.h" ; then - have_sys_signal_h=3Dyes -fi - ########################################## # VTE probe =20 @@ -6184,9 +6177,6 @@ fi if test "$have_openpty" =3D "yes" ; then echo "HAVE_OPENPTY=3Dy" >> $config_host_mak fi -if test "$have_sys_signal_h" =3D "yes" ; then - echo "HAVE_SYS_SIGNAL_H=3Dy" >> $config_host_mak -fi =20 # Work around a system header bug with some kernel/XFS header # versions where they both try to define 'struct fsxattr': diff --git a/meson.build b/meson.build index d6b633f17f..054e40e9a5 100644 --- a/meson.build +++ b/meson.build @@ -811,6 +811,7 @@ config_host_data.set('QEMU_VERSION_MICRO', meson.projec= t_version().split('.')[2] config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h')) config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h')) config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) +config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h')) =20 ignored =3D ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target arrays =3D ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BD= RV_RO_WHITELIST'] --=20 2.18.4 From nobody Thu May 2 10:27:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605719941; cv=none; d=zohomail.com; s=zohoarc; b=hcWDAomZhKQBnIUPNAJHvH/pH05DgXQwkGLfRI/Pan7NUk1LVOxGt6itxtMIO9CxwYxANULpc9o532Fo0++78cqZKM+ySBk4cZ0DnQTFmJdBi8m8XEJBbUhuBjnPyS0TNRvi+3Q4KV06LXARybbNAp14y2ihjNHGpShaGfLj3to= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605719941; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ZtinZ1XoMAywpC6Gi8Q8+uTef3TkD4+NWoz4UH2jjXY=; b=HLXKdtQP+KPxJWPULfsuK7W3CLl637eAzeZK5/9SaszzFiCk0jKb5+pJ+L+EeFGVBjQawfvZDVD5WX7DRIV9RVF81fQYzva+GTAAsW1kSivWzoJRL8eD73BloVyHp8fQPDJRrauBAnLmSc7hFKD2Yc2U3zKiwALt0YJSI49hzUQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1605719941298394.0081386538226; Wed, 18 Nov 2020 09:19:01 -0800 (PST) Received: from localhost ([::1]:50240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfR6i-00073b-6k for importer@patchew.org; Wed, 18 Nov 2020 12:19:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfQzA-0007nK-0x for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:27968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfQz5-00014e-8N for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:11 -0500 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-586-NEpYeDQaND2_z3Ix2pyt-w-1; Wed, 18 Nov 2020 12:11:04 -0500 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 D2259D8EC1; Wed, 18 Nov 2020 17:11:03 +0000 (UTC) Received: from thuth.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FCA460BE2; Wed, 18 Nov 2020 17:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605719466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=ZtinZ1XoMAywpC6Gi8Q8+uTef3TkD4+NWoz4UH2jjXY=; b=CSylU01FxF1yeLwaUOaLOnAamD0H0EdFID2ZvIgvXPYVOB/lzGpV1MJr6au+MIRJ/2mCt3 B57AqzCBS9MHGpLg3CGrSBRFXm7pdZcBGSbY+DqJdfU62vtUR46gqTejSo1LMcwQD+l7p+ jf2uozfh5YgBjynwiNwMBihwcjdHp1M= X-MC-Unique: NEpYeDQaND2_z3Ix2pyt-w-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 5/6] configure / meson: Move check for sys/signal.h to meson.build Date: Wed, 18 Nov 2020 18:10:51 +0100 Message-Id: <20201118171052.308191-6-thuth@redhat.com> In-Reply-To: <20201118171052.308191-1-thuth@redhat.com> References: <20201118171052.308191-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 19:41:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This check can be done in a much shorter way in meson.build. And while we're at it, rename the #define to HAVE_SYS_KCOV_H to match the other HAVE_someheader_H symbols that we already have. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- configure | 9 --------- linux-user/ioctls.h | 2 +- linux-user/syscall.c | 2 +- meson.build | 1 + 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 871e4bb9fb..8d40a0beb3 100755 --- a/configure +++ b/configure @@ -4389,12 +4389,6 @@ if compile_prog "" "" ; then syncfs=3Dyes fi =20 -# check for kcov support (kernel must be 4.4+, compiled with certain optio= ns) -kcov=3Dno -if check_include sys/kcov.h ; then - kcov=3Dyes -fi - # check for btrfs filesystem support (kernel must be 3.9+) btrfs=3Dno if check_include linux/btrfs.h ; then @@ -6092,9 +6086,6 @@ fi if test "$syncfs" =3D "yes" ; then echo "CONFIG_SYNCFS=3Dy" >> $config_host_mak fi -if test "$kcov" =3D "yes" ; then - echo "CONFIG_KCOV=3Dy" >> $config_host_mak -fi if test "$btrfs" =3D "yes" ; then echo "CONFIG_BTRFS=3Dy" >> $config_host_mak fi diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index 585874f090..8efb4d38c0 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -715,7 +715,7 @@ IOCTL_IGNORE(TIOCSTOP) #endif =20 -#ifdef CONFIG_KCOV +#ifdef HAVE_SYS_KCOV_H IOCTL(KCOV_ENABLE, 0, TYPE_NULL) IOCTL(KCOV_DISABLE, 0, TYPE_NULL) IOCTL(KCOV_INIT_TRACE, IOC_R, TYPE_ULONG) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 27adee908e..063130be04 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -73,7 +73,7 @@ #ifdef CONFIG_SENDFILE #include #endif -#ifdef CONFIG_KCOV +#ifdef HAVE_SYS_KCOV_H #include #endif =20 diff --git a/meson.build b/meson.build index 054e40e9a5..ab9571a354 100644 --- a/meson.build +++ b/meson.build @@ -811,6 +811,7 @@ config_host_data.set('QEMU_VERSION_MICRO', meson.projec= t_version().split('.')[2] config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h')) config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h')) config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) +config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h')) =20 ignored =3D ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target --=20 2.18.4 From nobody Thu May 2 10:27:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605720511; cv=none; d=zohomail.com; s=zohoarc; b=Q6dsIVpv2HePYgnW3+T5VbzsQSuP871pJn4oXj2PC4tPxPpr4kZ6BYIVGg/j0HvsjXz1V1loUgYlu1XDImGibz8mUxipZrkkLpWdk5y+uFxsgosTAb32O1Xj6cqBOvtATQr9kb8Oja+8/uVL34lejgZvI633Un5uhqD/kd6kKb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605720511; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=3WGr80JkgyiiyWGvFyhq2aOp55JP5uc5NQH9+YjEGj4=; b=QeCI3heEHSt93F9E+zZBAqom37UG88EAxXsp3ryP/Zg0v5MMQAe99zg/Z0BD0YnQ1gY39zzFLu1rZS4tkwejvOM3u/lrnCsW3jvsWrR+J3ssDIfxFuhweevEMthS1JNc+8qE8HDiYx4u+E+w+MC3rXKI5lIEPBJTIYjIrpKCcvw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1605720511182241.3040704512341; Wed, 18 Nov 2020 09:28:31 -0800 (PST) Received: from localhost ([::1]:37738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfRFt-0005kE-1g for importer@patchew.org; Wed, 18 Nov 2020 12:28:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfQz9-0007mN-Ih for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51133) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfQz7-00014t-FW for qemu-devel@nongnu.org; Wed, 18 Nov 2020 12:11:11 -0500 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-304-m--zndKFOhGclVX5VqLIFA-1; Wed, 18 Nov 2020 12:11:06 -0500 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 4960B803654; Wed, 18 Nov 2020 17:11:05 +0000 (UTC) Received: from thuth.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A33260BE2; Wed, 18 Nov 2020 17:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605719467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=3WGr80JkgyiiyWGvFyhq2aOp55JP5uc5NQH9+YjEGj4=; b=LrSAOEX4oLeG6yituS1T26ROzOosWppqqJFFI61ObYWXiapPebpSUmOk6fHKUKuGK32yC/ YfXlav94e9i0pbEc66RugDIKZC1TJ3DPcIkUIfthIISqFTCoe5ATYi0hdRe4AphfcQoZF7 PYbpCtITgqRMHbMnEbZBq5ktyjLhrxg= X-MC-Unique: m--zndKFOhGclVX5VqLIFA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 6/6] configure / meson: Move check for linux/btrfs.h to meson.build Date: Wed, 18 Nov 2020 18:10:52 +0100 Message-Id: <20201118171052.308191-7-thuth@redhat.com> In-Reply-To: <20201118171052.308191-1-thuth@redhat.com> References: <20201118171052.308191-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 19:41:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This check can be done in a much shorter way in meson.build. And while we're at it, rename the #define to HAVE_BTRFS_H to match the other HAVE_someheader_H symbols that we already have. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- configure | 9 --------- linux-user/syscall.c | 2 +- linux-user/syscall_defs.h | 2 +- meson.build | 1 + 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 8d40a0beb3..1ba4bf9a3d 100755 --- a/configure +++ b/configure @@ -4389,12 +4389,6 @@ if compile_prog "" "" ; then syncfs=3Dyes fi =20 -# check for btrfs filesystem support (kernel must be 3.9+) -btrfs=3Dno -if check_include linux/btrfs.h ; then - btrfs=3Dyes -fi - # Search for bswap_32 function byteswap_h=3Dno cat > $TMPC << EOF @@ -6086,9 +6080,6 @@ fi if test "$syncfs" =3D "yes" ; then echo "CONFIG_SYNCFS=3Dy" >> $config_host_mak fi -if test "$btrfs" =3D "yes" ; then - echo "CONFIG_BTRFS=3Dy" >> $config_host_mak -fi if test "$inotify" =3D "yes" ; then echo "CONFIG_INOTIFY=3Dy" >> $config_host_mak fi diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 063130be04..7bf99beb18 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -112,7 +112,7 @@ #include #include #include -#ifdef CONFIG_BTRFS +#ifdef HAVE_BTRFS_H #include #endif #ifdef HAVE_DRM_H diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index cabbfb762d..b934d0b606 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -1006,7 +1006,7 @@ struct target_rtc_pll_info { #define TARGET_FS_IOC32_SETVERSION TARGET_IOW('v', 2, int) =20 /* btrfs ioctls */ -#ifdef CONFIG_BTRFS +#ifdef HAVE_BTRFS_H #define TARGET_BTRFS_IOC_SNAP_CREATE TARGET_IOWU(BTRFS_IOCTL_MA= GIC, 1) #define TARGET_BTRFS_IOC_SCAN_DEV TARGET_IOWU(BTRFS_IOCTL_MA= GIC, 4) #define TARGET_BTRFS_IOC_FORGET_DEV TARGET_IOWU(BTRFS_IOCTL_MA= GIC, 5) diff --git a/meson.build b/meson.build index ab9571a354..bf62e260ed 100644 --- a/meson.build +++ b/meson.build @@ -808,6 +808,7 @@ config_host_data.set('QEMU_VERSION_MAJOR', meson.projec= t_version().split('.')[0] config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('= .')[2]) =20 +config_host_data.set('HAVE_BTRFS_H', cc.has_header('linux/btrfs.h')) config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h')) config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h')) config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) --=20 2.18.4