From nobody Sun Feb 8 19:13:08 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=1635447699; cv=none; d=zohomail.com; s=zohoarc; b=LevD6pY69d5QpSbSRo7IpipBizdYnyY+TuneUXmGlR3G7MgC4NIVMOcQwt0+9BjHqDD64uPjr9iJBoSuNQ3X3GzMT5/WYFS0/fWCf+U37VF6E8aEZke2ympS/hpSlcOwYZOWfVFf0BAZZCq0Vi6tuaIAxRhSKIxdx8V9Jh3d+Tg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635447699; h=Content-Type:Content-Transfer-Encoding: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=dkfJKsSlZdu051lRspIVZAAfoMLfgkV7GV+Eh4L/USU=; b=IiRyoFYe0TMy/LnCOozY6wRp0ZxwUcU0m1Uxb2JIif9nc8aDbx8u2a4QyXwwkk8RJbt8VrGRNBRAtlND/I4kFKcFyYXEQlBd5EAtXIB2dB1ty+X1fXMRJGie+QBMzL3llonRW3jEjHIDMi9FlQkPQrZM8kKPhxYmecmc94L7qrY= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635447699255171.59736472913607; Thu, 28 Oct 2021 12:01:39 -0700 (PDT) Received: from localhost ([::1]:37318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgAee-0004y4-2M for importer@patchew.org; Thu, 28 Oct 2021 15:01:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgAcb-0003HM-FM for qemu-devel@nongnu.org; Thu, 28 Oct 2021 14:59:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57321) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgAcW-0008Cd-2h for qemu-devel@nongnu.org; Thu, 28 Oct 2021 14:59:28 -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-303-iEWxzidDOD-IzBJ_gxl-qQ-1; Thu, 28 Oct 2021 14:59:21 -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 E73201054F90 for ; Thu, 28 Oct 2021 18:59:20 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 909C0694B6; Thu, 28 Oct 2021 18:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635447563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dkfJKsSlZdu051lRspIVZAAfoMLfgkV7GV+Eh4L/USU=; b=Ht8djlXwZbnqUPAxmSWFifwXP4LvXyaLKQ4HhDbct8BFG5OjeEJaSLERbasqBpyjUz6ZE2 jQYWgEC47R3TYQxsF8uJly6C/Uov9slsAMFz+PoXFyiKFILvspiKc2ceEU/CNSm7NKSPRM fHx/+N15Z2WFx/WBe8hJcg+FRu1bsJo= X-MC-Unique: iEWxzidDOD-IzBJ_gxl-qQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 1/4] configure: Remove the check for the __thread keyword Date: Thu, 28 Oct 2021 20:59:07 +0200 Message-Id: <20211028185910.1729744-2-thuth@redhat.com> In-Reply-To: <20211028185910.1729744-1-thuth@redhat.com> References: <20211028185910.1729744-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 Content-Transfer-Encoding: quoted-printable 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-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635447700348100001 Content-Type: text/plain; charset="utf-8" We recently bumped our minimum required version of GCC to 7.4 and Clang to 6.0, and those compiler versions should support the __thread keyword already. Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson --- configure | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/configure b/configure index 039467c04b..8fe03b6230 100755 --- a/configure +++ b/configure @@ -1749,17 +1749,6 @@ if test "$static" =3D "yes" ; then fi fi =20 -# Unconditional check for compiler __thread support - cat > $TMPC << EOF -static __thread int tls_var; -int main(void) { return tls_var; } -EOF - -if ! compile_prog "-Werror" "" ; then - error_exit "Your compiler does not support the __thread specifier for = " \ - "Thread-Local Storage (TLS). Please upgrade to a version that does." -fi - cat > $TMPC << EOF =20 #ifdef __linux__ --=20 2.27.0 From nobody Sun Feb 8 19:13:08 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=1635448003; cv=none; d=zohomail.com; s=zohoarc; b=W++yvPwnbSwtBR/tMTELn0TaI1bJ4edQ8TAHYlV7N7mr2awC+NtBFAeVCSSxJRwMOYYr3F789wJ1z61UKzH6DVitIpfUpv/fb7uW5AwMyPhvqOYkPtVEqDNCKRf1xR2Ml2lwTb/3IfM/prXYYVTpuqLU+lqQDllFI0WiMlywzqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635448003; h=Content-Type:Content-Transfer-Encoding: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=9yhi8L4C4GnMYKVMPV4uZwu5G4WEZ36IdMhnOK6XKYI=; b=UxXmUdnR+yibY8fMsVdi8nyPqW3mKSMnAGoByBPOUjRXZ5KrUQyGT3vIH7Lwop2zOn7/KgZ8EzhTs62l6KLjO8ocz+FNNMR/qcgAROXc7PpgurRGhQwpu6WGeL0NoMqC2WYpQUg1/d/XRRyiA6lzKjKz9vWhA7ZJ7HaDBiuoz+g= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635448003356753.2529021905709; Thu, 28 Oct 2021 12:06:43 -0700 (PDT) Received: from localhost ([::1]:46664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgAja-0002yE-BX for importer@patchew.org; Thu, 28 Oct 2021 15:06:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgAcl-0003NY-KR for qemu-devel@nongnu.org; Thu, 28 Oct 2021 14:59:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgAca-0008Cv-9s for qemu-devel@nongnu.org; Thu, 28 Oct 2021 14:59:39 -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-344-OV6OIQR3Py28SyEU2N53tg-1; Thu, 28 Oct 2021 14:59:23 -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 49446112C14B for ; Thu, 28 Oct 2021 18:59:22 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81F815BAF0; Thu, 28 Oct 2021 18:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635447564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9yhi8L4C4GnMYKVMPV4uZwu5G4WEZ36IdMhnOK6XKYI=; b=UmJuwj5phDpI71DPEFuIo9chmWHX2FNnZb8SJHVDhTkKJ3q5vnh7ka8WGjnO2MN3VMX61M FbJxBo6srEsoFuBBjlghPyee5nsZZGbmdmqg+E/BE46vxLyvyOU1IIpmY1T66saaCK8URv dlRh8bCgrsdAqwOW9QgCvExy9pKjtCQ= X-MC-Unique: OV6OIQR3Py28SyEU2N53tg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 2/4] Move the l2tpv3 test from configure to meson.build Date: Thu, 28 Oct 2021 20:59:08 +0200 Message-Id: <20211028185910.1729744-3-thuth@redhat.com> In-Reply-To: <20211028185910.1729744-1-thuth@redhat.com> References: <20211028185910.1729744-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 Content-Transfer-Encoding: quoted-printable 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635448004181100001 Content-Type: text/plain; charset="utf-8" And while we're at it, also provide a proper entry for this feature in meson_options.txt, so that people who don't need it have a knob to disable this feature. Signed-off-by: Thomas Huth --- configure | 17 ----------------- meson.build | 8 ++++++++ meson_options.txt | 2 ++ net/meson.build | 4 +++- scripts/meson-buildoptions.sh | 3 +++ 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 8fe03b6230..170b1b237a 100755 --- a/configure +++ b/configure @@ -1907,20 +1907,6 @@ if test -z "$want_tools"; then fi fi =20 -########################################## -# L2TPV3 probe - -cat > $TMPC < -#include -int main(void) { return sizeof(struct mmsghdr); } -EOF -if compile_prog "" "" ; then - l2tpv3=3Dyes -else - l2tpv3=3Dno -fi - ######################################### # vhost interdependencies and host support =20 @@ -3544,9 +3530,6 @@ if test "$slirp_smbd" =3D "yes" ; then echo "CONFIG_SLIRP_SMBD=3Dy" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=3D\"$smbd\"" >> $config_host_mak fi -if test "$l2tpv3" =3D "yes" ; then - echo "CONFIG_L2TPV3=3Dy" >> $config_host_mak -fi if test "$gprof" =3D "yes" ; then echo "CONFIG_GPROF=3Dy" >> $config_host_mak fi diff --git a/meson.build b/meson.build index 2c5b53cbe2..5bb6b901b0 100644 --- a/meson.build +++ b/meson.build @@ -1678,6 +1678,13 @@ config_host_data.set('HAVE_MLOCKALL', cc.links(gnu_s= ource_prefix + ''' return mlockall(MCL_FUTURE); }''')) =20 +have_l2tpv3 =3D false +if not get_option('l2tpv3').disabled() and have_system + have_l2tpv3 =3D (cc.has_header_symbol('sys/socket.h', 'struct mmsghdr') + and cc.has_header('linux/ip.h')) +endif +config_host_data.set('CONFIG_L2TPV3', have_l2tpv3) + have_netmap =3D false if not get_option('netmap').disabled() and have_system have_netmap =3D cc.compiles(''' @@ -3394,6 +3401,7 @@ summary_info +=3D {'JACK support': jack} summary_info +=3D {'brlapi support': brlapi} summary_info +=3D {'vde support': vde} summary_info +=3D {'netmap support': have_netmap} +summary_info +=3D {'l2tpv3 support': have_l2tpv3} summary_info +=3D {'Linux AIO support': libaio} summary_info +=3D {'Linux io_uring support': linux_io_uring} summary_info +=3D {'ATTR/XATTR support': libattr} diff --git a/meson_options.txt b/meson_options.txt index 4ab4570125..e740dce2a5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -141,6 +141,8 @@ option('u2f', type : 'feature', value : 'auto', description: 'U2F emulation support') option('usb_redir', type : 'feature', value : 'auto', description: 'libusbredir support') +option('l2tpv3', type : 'feature', value : 'auto', + description: 'l2tpv3 network backend support') option('netmap', type : 'feature', value : 'auto', description: 'netmap network backend support') option('vde', type : 'feature', value : 'auto', diff --git a/net/meson.build b/net/meson.build index 94383e7460..847bc2ac85 100644 --- a/net/meson.build +++ b/net/meson.build @@ -18,7 +18,9 @@ softmmu_ss.add(files( =20 softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c')) =20 -softmmu_ss.add(when: 'CONFIG_L2TPV3', if_true: files('l2tpv3.c')) +if have_l2tpv3 + softmmu_ss.add(files('l2tpv3.c')) +endif softmmu_ss.add(when: slirp, if_true: files('slirp.c')) softmmu_ss.add(when: vde, if_true: files('vde.c')) if have_netmap diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index c795a13020..55b8a78560 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -49,6 +49,7 @@ meson_options_help() { printf "%s\n" ' iconv Font glyph conversion support' printf "%s\n" ' jack JACK sound support' printf "%s\n" ' kvm KVM acceleration support' + printf "%s\n" ' l2tpv3 l2tpv3 network backend support' printf "%s\n" ' libdaxctl libdaxctl support' printf "%s\n" ' libiscsi libiscsi userspace initiator' printf "%s\n" ' libnfs libnfs block device driver' @@ -166,6 +167,8 @@ _meson_option_parse() { --disable-jack) printf "%s" -Djack=3Ddisabled ;; --enable-kvm) printf "%s" -Dkvm=3Denabled ;; --disable-kvm) printf "%s" -Dkvm=3Ddisabled ;; + --enable-l2tpv3) printf "%s" -Dl2tpv3=3Denabled ;; + --disable-l2tpv3) printf "%s" -Dl2tpv3=3Ddisabled ;; --enable-libdaxctl) printf "%s" -Dlibdaxctl=3Denabled ;; --disable-libdaxctl) printf "%s" -Dlibdaxctl=3Ddisabled ;; --enable-libiscsi) printf "%s" -Dlibiscsi=3Denabled ;; --=20 2.27.0 From nobody Sun Feb 8 19:13:08 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=1635447846; cv=none; d=zohomail.com; s=zohoarc; b=Q12m0PaoCLQ8DICtvzIwEdVXCPvp7ZFBZiIkLLcPjS7WJtGUCcUDKFT8k8nwvGwYAryRZJKr48VtITn40EwWxEffiN4uXu42wBqmDInVUQEBFUpJG80j+NxL1FCY7N+px/xr09VC6fZEBx35FgDZxmU8Du/562dZIohmim+hmfQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635447846; h=Content-Type:Content-Transfer-Encoding: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=TLgTXnsGGX4d3Y8+rSpBygnEQ07X7CqcCOCHZFx8L/w=; b=LzahKHkM/W22rI0wkOgk2VKkdn3i7map6oGjtI54wGecO+nANITdYiTTDx+dhrHBZ1n0oJZWLDt96sjlo72UYKIV7ZkdmMs0+pE2R3x/dKQTdvRwTs5XwxycmTbCf2BqM/onqvQty4LgEKHBvDVqwuT+c4lkM1s8GBl4O6+Sv68= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635447846566765.4422607318468; Thu, 28 Oct 2021 12:04:06 -0700 (PDT) Received: from localhost ([::1]:43170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgAh3-0000Z5-D8 for importer@patchew.org; Thu, 28 Oct 2021 15:04:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgAch-0003Mj-R9 for qemu-devel@nongnu.org; Thu, 28 Oct 2021 14:59:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31123) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgAcg-0008Dw-5n for qemu-devel@nongnu.org; Thu, 28 Oct 2021 14:59:35 -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-160-MKbMyjgEOWKXGq5lU0-Pxw-1; Thu, 28 Oct 2021 14:59:32 -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 5ABBE1054F98 for ; Thu, 28 Oct 2021 18:59:31 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id D015E5BAF0; Thu, 28 Oct 2021 18:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635447573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TLgTXnsGGX4d3Y8+rSpBygnEQ07X7CqcCOCHZFx8L/w=; b=LAmM2IAMcU4DgNTdrT3e6PtEnk2ZUkUugjJJ4eGnsEuDbaabG/UeVSxBX5DwJOYjyK3sEH MIcaqFzA29RiauwiGQ3H1u68+2oWIhIcF3AzIV4oioqwzA8Rm08g+iEihj4HMDuJ+D0Fs0 MtfzYMHhNWrsXHVgHvuQT3ZIqCpew6E= X-MC-Unique: MKbMyjgEOWKXGq5lU0-Pxw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 3/4] Move CONFIG_XFS handling to meson.build Date: Thu, 28 Oct 2021 20:59:09 +0200 Message-Id: <20211028185910.1729744-4-thuth@redhat.com> In-Reply-To: <20211028185910.1729744-1-thuth@redhat.com> References: <20211028185910.1729744-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 Content-Transfer-Encoding: quoted-printable 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635447847855100001 Content-Type: text/plain; charset="utf-8" Checking for xfsctl() can be done more easily in meson.build. Also, this is not a "real" feature like the other features that we provide with the "--enable-xxx" and "--disable-xxx" switches for the configure script, since this does not influence lots of code (it's only about one call to xfsctl() in file-posix.c), so people don't gain much with the ability to disable this with "--disable-xfsctl". Let's rather treat this like the other cc.has_function() checks in meson.build, i.e. don't add a new option for this in meson_options.txt. Signed-off-by: Thomas Huth --- configure | 31 ------------------------------- meson.build | 2 +- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/configure b/configure index 170b1b237a..2296c3e194 100755 --- a/configure +++ b/configure @@ -287,7 +287,6 @@ for opt do done =20 xen_ctrl_version=3D"$default_feature" -xfs=3D"$default_feature" membarrier=3D"$default_feature" vhost_kernel=3D"$default_feature" vhost_net=3D"$default_feature" @@ -1019,10 +1018,6 @@ for opt do ;; --enable-opengl) opengl=3D"yes" ;; - --disable-xfsctl) xfs=3D"no" - ;; - --enable-xfsctl) xfs=3D"yes" - ;; --disable-zlib-test) ;; --enable-guest-agent) guest_agent=3D"yes" @@ -1477,7 +1472,6 @@ cat << EOF avx512f AVX512F optimization support replication replication support opengl opengl support - xfsctl xfsctl support qom-cast-debug cast debugging support tools build qemu-io, qemu-nbd and qemu-img tools bochs bochs image format support @@ -2385,28 +2379,6 @@ EOF fi fi =20 -########################################## -# xfsctl() probe, used for file-posix.c -if test "$xfs" !=3D "no" ; then - cat > $TMPC << EOF -#include /* NULL */ -#include -int main(void) -{ - xfsctl(NULL, 0, 0, NULL); - return 0; -} -EOF - if compile_prog "" "" ; then - xfs=3D"yes" - else - if test "$xfs" =3D "yes" ; then - feature_not_found "xfs" "Install xfsprogs/xfslibs devel" - fi - xfs=3Dno - fi -fi - ########################################## # plugin linker support probe =20 @@ -3538,9 +3510,6 @@ echo "CONFIG_BDRV_RO_WHITELIST=3D$block_drv_ro_whitel= ist" >> $config_host_mak if test "$block_drv_whitelist_tools" =3D "yes" ; then echo "CONFIG_BDRV_WHITELIST_TOOLS=3Dy" >> $config_host_mak fi -if test "$xfs" =3D "yes" ; then - echo "CONFIG_XFS=3Dy" >> $config_host_mak -fi qemu_version=3D$(head $source_path/VERSION) echo "PKGVERSION=3D$pkgversion" >>$config_host_mak echo "SRC_PATH=3D$source_path" >> $config_host_mak diff --git a/meson.build b/meson.build index 5bb6b901b0..2bd922f2f3 100644 --- a/meson.build +++ b/meson.build @@ -1532,6 +1532,7 @@ config_host_data.set('CONFIG_SETNS', cc.has_function(= 'setns') and cc.has_functio config_host_data.set('CONFIG_SYNCFS', cc.has_function('syncfs')) config_host_data.set('CONFIG_SYNC_FILE_RANGE', cc.has_function('sync_file_= range')) config_host_data.set('CONFIG_TIMERFD', cc.has_function('timerfd_create')) +config_host_data.set('CONFIG_XFS', cc.has_function('xfsctl', prefix: '#inc= lude ')) config_host_data.set('HAVE_COPY_FILE_RANGE', cc.has_function('copy_file_ra= nge')) config_host_data.set('HAVE_OPENPTY', cc.has_function('openpty', dependenci= es: util)) config_host_data.set('HAVE_STRCHRNUL', cc.has_function('strchrnul')) @@ -3415,7 +3416,6 @@ if spice_protocol.found() summary_info +=3D {' spice server support': spice} endif summary_info +=3D {'rbd support': rbd} -summary_info +=3D {'xfsctl support': config_host.has_key('CONFIG_XFS')} summary_info +=3D {'smartcard support': cacard} summary_info +=3D {'U2F support': u2f} summary_info +=3D {'libusb': libusb} --=20 2.27.0 From nobody Sun Feb 8 19:13:08 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=1635448262; cv=none; d=zohomail.com; s=zohoarc; b=mkkM6otJUozckrwFddbWvtyZs/h7RS7Rz7BriDF/8LqkGWHSbZ/fCyjMzasm/xY/fxqKi3bJUhZ2ADyEuisohyRfQlIjGMDQwQ3mXZp5gefFLePcUj+bgd0BbmiKFtRO81PNYqpLaIAAATm5YnCSAAyvFpYfJUm0hPTzWZBIeKc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635448262; h=Content-Type:Content-Transfer-Encoding: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=BLzBP8c7sqBisM/zRTDOZKFze+g4xE71NDp05KMff8E=; b=D1M4gy8QWSs81KkbEl4Z0tpthUp00vHypY2zfQB9GJPJeAx9Vx3wjrU+Z+hxrm4lh+dQ4dpxFL5sNnGMslfXu2ZPIWEUcjF323Wh8M52u8WFfMuCT0qz2KdvpUqtQlqM55Cv6BmRrxkHIgkaYsezZ4jyDNxd41X0UwC6OhnlXqs= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635448262981456.4999113025258; Thu, 28 Oct 2021 12:11:02 -0700 (PDT) Received: from localhost ([::1]:50764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgAnl-0005qF-Vq for importer@patchew.org; Thu, 28 Oct 2021 15:11:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgAcn-0003QX-0v for qemu-devel@nongnu.org; Thu, 28 Oct 2021 14:59:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:31011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgAcl-0008Ec-9b for qemu-devel@nongnu.org; Thu, 28 Oct 2021 14:59:40 -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-141-8t25jkbpNU2svyWW3eahig-1; Thu, 28 Oct 2021 14:59:36 -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 50736112C143 for ; Thu, 28 Oct 2021 18:59:35 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 168B95BAE6; Thu, 28 Oct 2021 18:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635447578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BLzBP8c7sqBisM/zRTDOZKFze+g4xE71NDp05KMff8E=; b=dl36NmYgJiY1K87R2ws835J9Ih3XODBOgqALL/AJQN+kjQn32w25PCFLpzCn5gsSVBHiuD RWLbpQuH36qgje9e4ZpedTH0+XcIp68YqzvycrGCfApRsjGvGIYTTyRLNikOXyaXHNua4/ TG2QbAFZd0rPLd/fWRzwGGwFU/MOM9g= X-MC-Unique: 8t25jkbpNU2svyWW3eahig-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 4/4] Move the libssh setup from configure to meson.build Date: Thu, 28 Oct 2021 20:59:10 +0200 Message-Id: <20211028185910.1729744-5-thuth@redhat.com> In-Reply-To: <20211028185910.1729744-1-thuth@redhat.com> References: <20211028185910.1729744-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 Content-Transfer-Encoding: quoted-printable 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=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) 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_LOW=-0.7, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635448263679100001 Content-Type: text/plain; charset="utf-8" It's easier to do this in meson.build now. Signed-off-by: Thomas Huth --- configure | 27 --------------------------- meson.build | 12 ++++++++---- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +++ 4 files changed, 13 insertions(+), 31 deletions(-) diff --git a/configure b/configure index 2296c3e194..e6cb3528f2 100755 --- a/configure +++ b/configure @@ -339,7 +339,6 @@ debug_stack_usage=3D"no" crypto_afalg=3D"no" tls_priority=3D"NORMAL" tpm=3D"$default_feature" -libssh=3D"$default_feature" live_block_migration=3D${default_feature:-yes} numa=3D"$default_feature" replication=3D${default_feature:-yes} @@ -1071,10 +1070,6 @@ for opt do ;; --enable-tpm) tpm=3D"yes" ;; - --disable-libssh) libssh=3D"no" - ;; - --enable-libssh) libssh=3D"yes" - ;; --disable-live-block-migration) live_block_migration=3D"no" ;; --enable-live-block-migration) live_block_migration=3D"yes" @@ -1466,7 +1461,6 @@ cat << EOF live-block-migration Block migration in the main migration stream coroutine-pool coroutine freelist (better performance) tpm TPM support - libssh ssh block device support numa libnuma support avx2 AVX2 optimization support avx512f AVX512F optimization support @@ -2572,21 +2566,6 @@ if test "$modules" =3D yes; then fi fi =20 -########################################## -# libssh probe -if test "$libssh" !=3D "no" ; then - if $pkg_config --exists "libssh >=3D 0.8.7"; then - libssh_cflags=3D$($pkg_config libssh --cflags) - libssh_libs=3D$($pkg_config libssh --libs) - libssh=3Dyes - else - if test "$libssh" =3D "yes" ; then - error_exit "libssh required for --enable-libssh" - fi - libssh=3Dno - fi -fi - ########################################## # TPM emulation is only on POSIX =20 @@ -3644,12 +3623,6 @@ if test "$cmpxchg128" =3D "yes" ; then echo "CONFIG_CMPXCHG128=3Dy" >> $config_host_mak fi =20 -if test "$libssh" =3D "yes" ; then - echo "CONFIG_LIBSSH=3Dy" >> $config_host_mak - echo "LIBSSH_CFLAGS=3D$libssh_cflags" >> $config_host_mak - echo "LIBSSH_LIBS=3D$libssh_libs" >> $config_host_mak -fi - if test "$live_block_migration" =3D "yes" ; then echo "CONFIG_LIVE_BLOCK_MIGRATION=3Dy" >> $config_host_mak fi diff --git a/meson.build b/meson.build index 2bd922f2f3..7d43e6b5bc 100644 --- a/meson.build +++ b/meson.build @@ -871,11 +871,15 @@ if not get_option('glusterfs').auto() or have_block ''', dependencies: glusterfs) endif endif + libssh =3D not_found -if 'CONFIG_LIBSSH' in config_host - libssh =3D declare_dependency(compile_args: config_host['LIBSSH_CFLAGS']= .split(), - link_args: config_host['LIBSSH_LIBS'].split(= )) +if not get_option('libssh').auto() or have_block + libssh =3D dependency('libssh', version: '>=3D0.8.7', + method: 'pkg-config', + required: get_option('libssh'), + kwargs: static_kwargs) endif + libbzip2 =3D not_found if not get_option('bzip2').auto() or have_block libbzip2 =3D cc.find_library('bz2', has_headers: ['bzlib.h'], @@ -3433,7 +3437,7 @@ endif summary_info +=3D {'seccomp support': seccomp} summary_info +=3D {'GlusterFS support': glusterfs} summary_info +=3D {'TPM support': config_host.has_key('CONFIG_TPM')} -summary_info +=3D {'libssh support': config_host.has_key('CONFIG_LIBSSH= ')} +summary_info +=3D {'libssh support': libssh} summary_info +=3D {'lzo support': lzo} summary_info +=3D {'snappy support': snappy} summary_info +=3D {'bzip2 support': libbzip2} diff --git a/meson_options.txt b/meson_options.txt index e740dce2a5..da46a55984 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -105,6 +105,8 @@ option('libdaxctl', type : 'feature', value : 'auto', description: 'libdaxctl support') option('libpmem', type : 'feature', value : 'auto', description: 'libpmem support') +option('libssh', type : 'feature', value : 'auto', + description: 'ssh block device support') option('libudev', type : 'feature', value : 'auto', description: 'Use libudev to enumerate host devices') option('libusb', type : 'feature', value : 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 55b8a78560..2b9e51455d 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -54,6 +54,7 @@ meson_options_help() { printf "%s\n" ' libiscsi libiscsi userspace initiator' printf "%s\n" ' libnfs libnfs block device driver' printf "%s\n" ' libpmem libpmem support' + printf "%s\n" ' libssh ssh block device support' printf "%s\n" ' libudev Use libudev to enumerate host devices' printf "%s\n" ' libusb libusb support for USB passthrough' printf "%s\n" ' libxml2 libxml2 support for Parallels image for= mat' @@ -177,6 +178,8 @@ _meson_option_parse() { --disable-libnfs) printf "%s" -Dlibnfs=3Ddisabled ;; --enable-libpmem) printf "%s" -Dlibpmem=3Denabled ;; --disable-libpmem) printf "%s" -Dlibpmem=3Ddisabled ;; + --enable-libssh) printf "%s" -Dlibssh=3Denabled ;; + --disable-libssh) printf "%s" -Dlibssh=3Ddisabled ;; --enable-libudev) printf "%s" -Dlibudev=3Denabled ;; --disable-libudev) printf "%s" -Dlibudev=3Ddisabled ;; --enable-libusb) printf "%s" -Dlibusb=3Denabled ;; --=20 2.27.0