From nobody Wed Nov 27 00:39:33 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=1703179393; cv=none; d=zohomail.com; s=zohoarc; b=VBu8cvFQS77blx+igOk2G5AECs7ppOQvdnsItdEfnZSYNbKgmUfgOFpUz2R8h0jXB8y4/5hfl/2/GcAClvc2wUKMzYPUCvpGByGEEq+sIyGeXtDeiTp4+zobn4uWkPpCGz4DCbI3w3QugOZeQ+IbBg4+m/sIy4PRBTGdH0b6u1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703179393; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=ZGe578TNuximFmLhEvGbqzpnfBIm+qVcI5gcFSmVLn0=; b=ZAPtyrGi+ddqygysEe4zgd3ixyGG9poLGGmu47XD/988rdvKbkOnRJsJSum2OoHxb6scZdedQJ2JVhSmjnuGvzBtoc/OBxmLwjNepBh+ctv4UoMDWpYBuzXRP4X8NO9Q8h/lAQIf8RiKNQP/jmSilPQR1FvrF5ne/VsjdaF3rKI= 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 170317939395998.06975331017372; Thu, 21 Dec 2023 09:23:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMil-0007bd-4d; Thu, 21 Dec 2023 12:20:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMij-0007bI-Km for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMih-0004X4-Sn for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:29 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-191-P_WgTcplOmaC0jOPoS5TzA-1; Thu, 21 Dec 2023 12:20:24 -0500 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-33667220256so703706f8f.3 for ; Thu, 21 Dec 2023 09:20:24 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id f12-20020a05600c154c00b0040d18ffbeeasm4063274wmg.31.2023.12.21.09.20.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179226; 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=ZGe578TNuximFmLhEvGbqzpnfBIm+qVcI5gcFSmVLn0=; b=Fbl32hMUUgYSId+Fq9aqufxAVveFzmwKqHnd0hXbop+iy8jhVNLhutcCKdqBHE3kKzenod JhHtnEi47+KDEH7T1j3tZ269RnvsacaTk4jaheY/TRN8c27C6hGHGrZudrK/AO+wVq7CT3 QlPNaLCIa5OlgV+/d3gOf2gKdGaX5Xg= X-MC-Unique: P_WgTcplOmaC0jOPoS5TzA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179223; x=1703784023; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZGe578TNuximFmLhEvGbqzpnfBIm+qVcI5gcFSmVLn0=; b=gqhVOXWTe4kDujY8O1mFvr4KUGMRi8mUoOPsThgpkR5QPPBTakwyrSLEpT462XytvX pFuTpwm36NL4fCaBzo3seWuVxQJ9Ic1RPAQx62MpphPfTcjJ8CIM503RfrH30DUIkw6c DZGosZqzve+LdZgCTspg458HVxmoUqWXQb8IT0Qvt4xJaeXGk6LK0r36S9GRCWTtpgJN A1JkjBzC7WUB/YbAXa/8VQ2QMEi5mqrPVWVZb9TinhiipcjvIGTgTrGtAnwcb1mdkh7H VjmT0VB4Nllj213U12hJ+mp424yi3E0p+Rwd7mcgA9YR+UBfw2J2jTOF7U9wnHN0Yn1A eg2A== X-Gm-Message-State: AOJu0YwgrGHKXHaoDN8/jIrWn39QoeQgbRDzWLB2BRpS0JW74IlzT5EN afCf0HcGlVrk5tV99H5sXZCpW3oV/jSJ55+PVcQ08WCBqB2Iv3S5H07EkHH9EHNladebXznhbz0 4smZDT/bEtLcV5crWgvIduUgnIysfAMrXn2Yi5K67uYip6NNr37FJM3F+Z+uZHtnBZFSmu52iSk tuH5TuYSM= X-Received: by 2002:a05:600c:1553:b0:40b:5e1f:6fd8 with SMTP id f19-20020a05600c155300b0040b5e1f6fd8mr39202wmg.45.1703179222784; Thu, 21 Dec 2023 09:20:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IHxEjF51LORulsyckx6HyovBrnB0fV3hTdtNbAVMzS6BQrPyBm/fArLdIwa/vPb5+UqSwlJXg== X-Received: by 2002:a05:600c:1553:b0:40b:5e1f:6fd8 with SMTP id f19-20020a05600c155300b0040b5e1f6fd8mr39197wmg.45.1703179222367; Thu, 21 Dec 2023 09:20:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 12/21] meson: rename config_all Date: Thu, 21 Dec 2023 18:19:49 +0100 Message-ID: <20231221171958.59350-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1703179396186100007 Content-Type: text/plain; charset="utf-8" config_all now lists only accelerators, rename it to indicate its actual content. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/meson.build | 2 +- meson.build | 16 ++++++++-------- target/arm/meson.build | 2 +- target/mips/meson.build | 2 +- tests/fp/meson.build | 2 +- tests/meson.build | 2 +- tests/qtest/meson.build | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hw/mips/meson.build b/hw/mips/meson.build index 900613fc087..f06d88f3430 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -5,7 +5,7 @@ mips_ss.add(when: 'CONFIG_LOONGSON3V', if_true: files('loon= gson3_bootp.c', 'loon mips_ss.add(when: 'CONFIG_MALTA', if_true: files('malta.c')) mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c')) =20 -if 'CONFIG_TCG' in config_all +if 'CONFIG_TCG' in config_all_accel mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) diff --git a/meson.build b/meson.build index 49cc1886bb2..b5a85c4c255 100644 --- a/meson.build +++ b/meson.build @@ -2841,7 +2841,7 @@ endif =20 minikconf =3D find_program('scripts/minikconf.py') =20 -config_all =3D {} +config_all_accel =3D {} config_all_devices =3D {} config_devices_mak_list =3D [] config_devices_h =3D {} @@ -2929,7 +2929,7 @@ foreach target : target_dirs foreach sym: accelerators if sym =3D=3D 'CONFIG_TCG' or target in accelerator_targets.get(sym, [= ]) config_target +=3D { sym: 'y' } - config_all +=3D { sym: 'y' } + config_all_accel +=3D { sym: 'y' } if target in modular_tcg config_target +=3D { 'CONFIG_TCG_MODULAR': 'y' } else @@ -4180,18 +4180,18 @@ endif # Targets and accelerators summary_info =3D {} if have_system - summary_info +=3D {'KVM support': config_all.has_key('CONFIG_KVM')} - 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 {'NVMM support': config_all.has_key('CONFIG_NVMM'= )} + summary_info +=3D {'KVM support': config_all_accel.has_key('CONFIG= _KVM')} + summary_info +=3D {'HVF support': config_all_accel.has_key('CONFIG= _HVF')} + summary_info +=3D {'WHPX support': config_all_accel.has_key('CONFIG= _WHPX')} + summary_info +=3D {'NVMM support': config_all_accel.has_key('CONFIG= _NVMM')} summary_info +=3D {'Xen support': xen.found()} if xen.found() summary_info +=3D {'xen ctrl version': xen.version()} endif summary_info +=3D {'Xen emulation': config_all_devices.has_key('CONF= IG_XEN_EMU')} endif -summary_info +=3D {'TCG support': config_all.has_key('CONFIG_TCG')} -if config_all.has_key('CONFIG_TCG') +summary_info +=3D {'TCG support': config_all_accel.has_key('CONFIG_T= CG')} +if config_all_accel.has_key('CONFIG_TCG') if get_option('tcg_interpreter') summary_info +=3D {'TCG backend': 'TCI (TCG with bytecode interprete= r, slow)'} else diff --git a/target/arm/meson.build b/target/arm/meson.build index d6c3902e676..46b5a21eb31 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -28,7 +28,7 @@ arm_system_ss.add(files( =20 subdir('hvf') =20 -if 'CONFIG_TCG' in config_all +if 'CONFIG_TCG' in config_all_accel subdir('tcg') else arm_ss.add(files('tcg-stubs.c')) diff --git a/target/mips/meson.build b/target/mips/meson.build index e57ef24ecf4..a26d1e1f792 100644 --- a/target/mips/meson.build +++ b/target/mips/meson.build @@ -12,7 +12,7 @@ if have_system subdir('sysemu') endif =20 -if 'CONFIG_TCG' in config_all +if 'CONFIG_TCG' in config_all_accel subdir('tcg') endif =20 diff --git a/tests/fp/meson.build b/tests/fp/meson.build index cbc17392d67..9ef322afc42 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -1,4 +1,4 @@ -if 'CONFIG_TCG' not in config_all +if 'CONFIG_TCG' not in config_all_accel subdir_done() endif # There are namespace pollution issues on Windows, due to osdep.h diff --git a/tests/meson.build b/tests/meson.build index 9996a293fbb..32cc15a3ef7 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -76,7 +76,7 @@ endif =20 subdir('decode') =20 -if 'CONFIG_TCG' in config_all +if 'CONFIG_TCG' in config_all_accel subdir('fp') endif =20 diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 40a8bb043e4..565eff4c0a2 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -155,8 +155,8 @@ qtests_ppc =3D \ qtests_filter + \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + = \ - (config_all.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + = \ - (config_all.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) + = \ + (config_all_accel.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + = \ + (config_all_accel.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) + = \ ['boot-order-test'] =20 qtests_ppc64 =3D \ @@ -213,12 +213,12 @@ qtests_arm =3D \ # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-tes= t unconditional qtests_aarch64 =3D \ (cpu !=3D 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + = \ - (config_all.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG= _TPM_TIS_SYSBUS') ? \ + (config_all_accel.has_key('CONFIG_TCG') and config_all_devices.has_key('= CONFIG_TPM_TIS_SYSBUS') ? \ ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + = \ (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test'= , 'fuzz-xlnx-dp-test'] : []) + \ (config_all_devices.has_key('CONFIG_XLNX_VERSAL') ? ['xlnx-canfd-test', = 'xlnx-versal-trng-test'] : []) + \ (config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : [])= + \ - (config_all.has_key('CONFIG_TCG') and = \ + (config_all_accel.has_key('CONFIG_TCG') and = \ config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test']= : []) + \ ['arm-cpu-features', 'numa-test', --=20 2.43.0