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 X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3D67C433DB for ; Tue, 16 Mar 2021 05:29:00 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 707B964DFB for ; Tue, 16 Mar 2021 05:29:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 707B964DFB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM2GJ-0003YX-92 for qemu-devel@archiver.kernel.org; Tue, 16 Mar 2021 01:28:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM2Fi-00037n-ND for qemu-devel@nongnu.org; Tue, 16 Mar 2021 01:28:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29193) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lM2Fh-0006vJ-30 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 01:28:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615872499; 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; bh=kgvOVTf2kY1LzrzPfJ/qBq4yuGN55ZahxlLVIvPbFp4=; b=VSKIa+00OaSDg3ask8S148ZCnVCLnc52318qnKebcfAZIT78zHZ3CnpYOiXWfehxl7QkS7 Z3gRlxvNIn7U8gTAEgAdew2e3OaxDB5KG9n+6RCrTW1uD1aVBCv7D01mgdO0twIRm5QYfO aUkJR8PYnG7EGj7ToxlnFvcz4IwbYZw= 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-302-GflIJ4bFN7ycmgdC54Xbjw-1; Tue, 16 Mar 2021 01:28:17 -0400 X-MC-Unique: GflIJ4bFN7ycmgdC54Xbjw-1 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 72EA63FD7 for ; Tue, 16 Mar 2021 05:28:16 +0000 (UTC) Received: from thuth.remote.csb (ovpn-112-110.ams2.redhat.com [10.36.112.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90A915D768; Tue, 16 Mar 2021 05:28:15 +0000 (UTC) Subject: Re: [RFC PATCH] configure: Poison (almost) all target-specific #defines To: Eric Blake , qemu-devel@nongnu.org References: <20210315135410.221729-1-thuth@redhat.com> <1a8dc3e5-0d8e-e52b-897d-69d0b2e28fd4@redhat.com> From: Thomas Huth Message-ID: <1d8f79e6-c8b7-b9a4-4af4-7a48e999d5cd@redhat.com> Date: Tue, 16 Mar 2021 06:28:14 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <1a8dc3e5-0d8e-e52b-897d-69d0b2e28fd4@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, 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: , Cc: Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 15/03/2021 19.24, Eric Blake wrote: > On 3/15/21 8:54 AM, Thomas Huth wrote: >> We are generating a lot of target-specific defines in the *-config-devices.h >> and *-config-target.h files. Using them in common code is wrong and leads >> to very subtle bugs since a "#ifdef CONFIG_SOMETHING" is not working there >> as expected. To avoid these issues, we are already poisoning some of the >> macros in include/exec/poison.h - but maintaining this list manually is >> cumbersome. Thus let's generate the list of poisoned macros automatically >> instead. >> Note that CONFIG_TCG (which is also defined in config-host.h) and >> CONFIG_USER_ONLY are special, so we have to filter these out. >> >> Signed-off-by: Thomas Huth >> --- >> RFC since the shell stuff in "configure" is quite ugly ... maybe there's >> a better way to do this via meson, but my meson-foo is still lacking... >> > >> +++ b/configure >> @@ -6441,6 +6441,11 @@ if test -n "${deprecated_features}"; then >> echo " features: ${deprecated_features}" >> fi >> >> +cat *-config-devices.h *-config-target.h | grep '^#define ' \ >> + | grep -v CONFIG_TCG | grep -v CONFIG_USER_ONLY \ >> + | sed -e 's/#define //' -e 's/ .*//' | sort -u \ >> + | sed -e 's/^/#pragma GCC poison /' > config-poison.h > > Most times, a 'grep | sed' pipeline can be rewritten in pure sed. In > this case: > > cat *-config-devices.h *-config-target.h | \ > sed -n -e '/^#define / { s///; /CONFIG_TCG/d; /CONFIG_USER_ONLY/d;' \ > -e 's/ .*//; s/^/#pragma GCC poison /p; }' | \ > sort -u > config-poison.h Thanks! I'll update my patch and use your suggestion (unless someone comes up with some Meson magic to do it there instead) Thomas