From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7B6F0C02192 for ; Mon, 3 Feb 2025 10:09:44 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tetO6-0006Hn-20; Mon, 03 Feb 2025 05:09:06 -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 1tetO4-0006Hd-JV for qemu-devel@nongnu.org; Mon, 03 Feb 2025 05:09:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tetO2-000622-Uo for qemu-devel@nongnu.org; Mon, 03 Feb 2025 05:09:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738577340; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=XT6Dmmx73RiJGQTtMpVkWED7k3bGYEcqfFae0KH8wBA=; b=L8hSnSpPc0Tm/xJ5OsuN1AmxJ2/RAtgbKncK8Do8F6F95VZIKyJJ+SaOaJGpc0n+se64/4 4kf+bDOJ4pLMKR1UifyzZ6QCfK+TdOwIakdKNfG90ePqw0TGcKfHtFdfOlPoIyXsvtuT0D YufY8Ua7PeCdEJqYbEdtKVdT7rowL48= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-396-z4Q9RvBTNw2zdgrtdHiGXA-1; Mon, 03 Feb 2025 05:08:59 -0500 X-MC-Unique: z4Q9RvBTNw2zdgrtdHiGXA-1 X-Mimecast-MFC-AGG-ID: z4Q9RvBTNw2zdgrtdHiGXA Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-385ed79291eso2289378f8f.0 for ; Mon, 03 Feb 2025 02:08:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738577338; x=1739182138; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=XT6Dmmx73RiJGQTtMpVkWED7k3bGYEcqfFae0KH8wBA=; b=U0WmAlf3/+IOCEADwPlmppyJ7bSz+GZmvaU+7gZMfjX4a2k9UY87U+WOklitaiA0j4 8TnS+LzVwSt9Vo7sEN6kOVQu4obSMbSFm9dXdfMXKnrBfMOjmq6u26iATc31nzYat3dm 51pxTOxUk+xrEk1PRSleWQivK226V7RhFfA2ZjeHh4LR1NWhSYCGZiFFmeoxe1xKvVuQ S6kahJoRlsNq+k/O2gFKEW/g7TaFd0BEy1hv4dIlHhHjqBZ+XXVfELHvTWpGtD2WcvKn xHHnGjBkU7rT5OP+uCITcklsOm92YBOYzjon2yM61hmysJ99l+b2r3+BkUUwYu/q/vtF V3cg== X-Forwarded-Encrypted: i=1; AJvYcCWWPTqRpdMLIzsEZ+x6ctaEmKhQP0Fz8y/X7NpJIv5VvvlrQHG/9Wzxvx0lLoK2rT+ok3x6+RkUemE4@nongnu.org X-Gm-Message-State: AOJu0YzIWwr1YUiaD+MSrLkT+e7yUz6wF4LkbI5JRtnd4sJK+PWmkftw OIhSz4tB6l12fuch4mEnUhMVDBgG+qiv1a57kzQmos2pHRlSXeeEL/xVarFpQXbHyErVy0QPYDJ 7D6UsDGVjRuSv0dMpX5D8554+tXigHJ0bixDLAJEvtzq1npUVax4J X-Gm-Gg: ASbGncs5C52Y7wmObzctyFjykKBNt3LxiPMb7OIxzKLVYTZxWAivOg5h/7ld8BS5kk1 lLSh5OCd4XkpzfNaN7wrA7AyAVbrNV28Y0EmzrTtb/yuOxOSXOJBYGgRNgXvG04GjDetv93rWU/ YGU/Fx1EK/ECXWSCR4mZxXVp1BgcKFhfBpFsHSbz2LCl55FgGCkGsLwZOwLedVpxorubR9xAnsV l5UHSfd53OhJBFaOwgBI5atF91FJvOvRyOjROv2ZkZ8xkPdGOlKi4Sp12EryVHXzZciizy4X9ik jhCQanmUNAwu3HQVuRJH1DGrs+rZ2Q== X-Received: by 2002:a5d:64c4:0:b0:38b:f4e6:21aa with SMTP id ffacd0b85a97d-38c5a956b96mr12199062f8f.5.1738577337899; Mon, 03 Feb 2025 02:08:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IE7uYvYsaPF0aTcSrXEdnfUfABp6+NMeDFn4e+vmfW7fhW5W4M1SzFC3A7yRG83VYkMY2igSw== X-Received: by 2002:a5d:64c4:0:b0:38b:f4e6:21aa with SMTP id ffacd0b85a97d-38c5a956b96mr12199040f8f.5.1738577337537; Mon, 03 Feb 2025 02:08:57 -0800 (PST) Received: from [10.33.192.228] (nat-pool-str-t.redhat.com. [149.14.88.106]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c5c102e19sm12490637f8f.36.2025.02.03.02.08.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Feb 2025 02:08:57 -0800 (PST) Message-ID: <5c118b5d-a943-499c-a0ce-f19c74ab7d94@redhat.com> Date: Mon, 3 Feb 2025 11:08:56 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 04/14] meson: Introduce CONFIG_TCG_TARGET To: Richard Henderson , qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, berrange@redhat.com, philmd@linaro.org References: <20250203031821.741477-1-richard.henderson@linaro.org> <20250203031821.741477-5-richard.henderson@linaro.org> Content-Language: en-US From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20250203031821.741477-5-richard.henderson@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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: -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_H2=-0.01, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 03/02/2025 04.18, Richard Henderson wrote: > Use CONFIG_TCG as a project-wide flag to indicate that TCG is enabled > for *some* target. Use CONFIG_TCG_TARGET to indicate that TCG is > enabled for a specific target. > > Within a specific compilation unit, we can remap CONFIG_TCG based on > CONFIG_TCG_TARGET. This allows us to avoid changes to the bulk of > the code base. > > Within meson.build, while CONFIG_TCG may be set in config_host_data, > it may not be set within config_target. Thus all references to > CONFIG_TCG in source_set 'when:' need not be updated. > > For the moment, CONFIG_TCG and CONFIG_TCG_TARGET are identical. > > Signed-off-by: Richard Henderson > --- > include/qemu/osdep.h | 7 +++++++ > meson.build | 11 +++++++---- > 2 files changed, 14 insertions(+), 4 deletions(-) > > diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h > index 112ebdff21..1f6f73a148 100644 > --- a/include/qemu/osdep.h > +++ b/include/qemu/osdep.h > @@ -34,9 +34,16 @@ > #include "config-host.h" > #ifdef COMPILING_PER_TARGET > #include CONFIG_TARGET > +# ifdef CONFIG_TCG_TARGET > +# undef CONFIG_TCG_TARGET > +# else > +# undef CONFIG_TCG > +# endif > #else > #include "exec/poison.h" > #endif > +#pragma GCC poison CONFIG_TCG_TARGET Shouldn't that rather go before the "#endif" instead? Also, would it be possible to rather adjust scripts/make-config-poison.sh instead of poisoning this switch manually? Thomas > > /* > * HOST_WORDS_BIGENDIAN was replaced with HOST_BIG_ENDIAN. Prevent it from > diff --git a/meson.build b/meson.build > index b72114819b..5ca3cc3f34 100644 > --- a/meson.build > +++ b/meson.build > @@ -3270,11 +3270,14 @@ foreach target : target_dirs > > target_kconfig = [] > foreach sym: accelerators > - if sym == 'CONFIG_TCG' or target in accelerator_targets.get(sym, []) > - config_target += { sym: 'y' } > - config_all_accel += { sym: 'y' } > - target_kconfig += [ sym + '=y' ] > + if sym == 'CONFIG_TCG' > + config_target += { 'CONFIG_TCG_TARGET': 'y' } > + elif target not in accelerator_targets.get(sym, []) > + continue > endif > + config_target += { sym: 'y' } > + config_all_accel += { sym: 'y' } > + target_kconfig += [ sym + '=y' ] > endforeach > if target_kconfig.length() == 0 > if default_targets