From nobody Sun Apr 28 04:17:05 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=1600285388; cv=none; d=zohomail.com; s=zohoarc; b=n3Kmq/Rq+ug2ExsQmOKu2m4d5RfJszs03pd46oSOSgdnemo4Acotp4iSB+kB16iiCXaHioN88FAtHOQvEiNdEDR7y2w5iC6E5ngtuFApDunEorKEsbfzA+7MpxNzRZTdxl07LHtJSreATkKdRA9pemBoTFLe0DucwCBy+0QP6GQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600285388; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=CzWvqxo1A5jXgTixZzgOb7OQSYKC9rOU10xMGcXiXe0=; b=MU+B6W5SlhqpmwCmyYEJD6IvmHe6/JRS9Jf9xv4qr4g3P1htc5Ge+PwBQl2aIH1IWCR2WhpcDFKcZ7CG+4+V7qrRb4Ja8NqULVwZ3zwSqmC/s/egId3Hckm10gySCxreGCL31F0LHWmLvMg14s5QzkC1I7yESfz3XciihfaI2EI= 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 1600285388624770.1408701571506; Wed, 16 Sep 2020 12:43:08 -0700 (PDT) Received: from localhost ([::1]:36378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIdKd-0006Mr-9Y for importer@patchew.org; Wed, 16 Sep 2020 15:43:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIdJa-0005ty-Ac for qemu-devel@nongnu.org; Wed, 16 Sep 2020 15:42:02 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:47762 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIdJV-0002IV-0c for qemu-devel@nongnu.org; Wed, 16 Sep 2020 15:42:01 -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-423-t6lpneTMPlGKH-4Cg4bY5g-1; Wed, 16 Sep 2020 15:41:51 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC228186DD33 for ; Wed, 16 Sep 2020 19:41:50 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A99B75145; Wed, 16 Sep 2020 19:41:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600285315; 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; bh=CzWvqxo1A5jXgTixZzgOb7OQSYKC9rOU10xMGcXiXe0=; b=SSm0nZatj3sFMnMs5UlnSRzOP8bAoYdhG68grnBM6ZX9LH3B69BoAlbXoD1zbF/Js+0z4I zIQ2BN+5j3wb0dPN1PgXthzfwOHAYPaucy9l7IluCUNSk8KQ04dw+k+udFebE9cNbMBYHm 02teqwORPA1AwA2BJ49OgcO3C1d3rcA= X-MC-Unique: t6lpneTMPlGKH-4Cg4bY5g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] meson: report accelerator support Date: Wed, 16 Sep 2020 15:41:50 -0400 Message-Id: <20200916194150.5054-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/16 11:15:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_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: , Cc: Andrew Jones Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Note that the "real" support is reported. A configuration like --disable-system --enable-kvm will report "no" for "KVM support" because no KVM-supported target is being compiled. Reported-by: Andrew Jones Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 0b805f42a0..91f626f39a 100644 --- a/meson.build +++ b/meson.build @@ -575,6 +575,7 @@ endforeach genh +=3D configure_file(output: 'config-host.h', configuration: config_ho= st_data) =20 minikconf =3D find_program('scripts/minikconf.py') +config_all =3D {} config_all_devices =3D {} config_all_disas =3D {} config_devices_mak_list =3D [] @@ -630,6 +631,14 @@ kconfig_external_symbols =3D [ ] ignored =3D ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] =20 +accel_symbols =3D [ + 'CONFIG_KVM', + 'CONFIG_HAX', + 'CONFIG_HVF', + 'CONFIG_TCG', + 'CONFIG_WHPX' +] + foreach target : target_dirs config_target =3D keyval.load(meson.current_build_dir() / target / 'conf= ig-target.mak') =20 @@ -658,6 +667,11 @@ foreach target : target_dirs config_target_data.set(k, v) endif endforeach + foreach sym: accel_symbols + if config_target.has_key(sym) + config_all +=3D { sym: 'y' } + endif + endforeach config_target_h +=3D {target: configure_file(output: target + '-config-t= arget.h', configuration: config_targe= t_data)} =20 @@ -702,7 +716,7 @@ endforeach # targets that are not built for this compilation. The CONFIG_ALL # pseudo symbol replaces it. =20 -config_all =3D config_all_devices +config_all +=3D config_all_devices config_all +=3D config_host config_all +=3D config_all_disas config_all +=3D { @@ -1529,16 +1543,15 @@ summary_info +=3D {'Linux AIO support': config_host= .has_key('CONFIG_LINUX_AIO')} summary_info +=3D {'Linux io_uring support': config_host.has_key('CONFIG_L= INUX_IO_URING')} summary_info +=3D {'ATTR/XATTR support': config_host.has_key('CONFIG_ATTR'= )} summary_info +=3D {'Install blobs': config_host.has_key('INSTALL_BLOBS= ')} -# TODO: add back KVM/HAX/HVF/WHPX/TCG -#summary_info +=3D {'KVM support': have_kvm'} -#summary_info +=3D {'HAX support': have_hax'} -#summary_info +=3D {'HVF support': have_hvf'} -#summary_info +=3D {'WHPX support': have_whpx'} -#summary_info +=3D {'TCG support': have_tcg'} -#if get_option('tcg') -# summary_info +=3D {'TCG debug enabled': config_host.has_key('CONFIG_DEB= UG_TCG')} -# summary_info +=3D {'TCG interpreter': config_host.has_key('CONFIG_TCG= _INTERPRETER')} -#endif +summary_info +=3D {'KVM support': config_all.has_key('CONFIG_KVM')} +summary_info +=3D {'HAX support': config_all.has_key('CONFIG_HAX')} +summary_info +=3D {'HVF support': config_all.has_key('CONFIG_HVF')} +summary_info +=3D {'WHPX support': config_all.has_key('CONFIG_WHPX')} +summary_info +=3D {'TCG support': config_all.has_key('CONFIG_TCG')} +if config_all.has_key('CONFIG_TCG') + summary_info +=3D {'TCG debug enabled': config_host.has_key('CONFIG_DEBU= G_TCG')} + summary_info +=3D {'TCG interpreter': config_host.has_key('CONFIG_TCG_= INTERPRETER')} +endif summary_info +=3D {'malloc trim support': has_malloc_trim} summary_info +=3D {'RDMA support': config_host.has_key('CONFIG_RDMA')} summary_info +=3D {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA= ')} --=20 2.26.2