From nobody Mon Feb 9 01:19:38 2026 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