From patchwork Mon Jun 5 20:15:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 689241 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp2287297wru; Mon, 5 Jun 2023 13:23:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4YRTTPkZcPzyNcPvqtCwe+8oD0+HXKf4bFSe4XX2EineHTeLWAB8fwMb4+7sYdmLkVb2GY X-Received: by 2002:a37:688a:0:b0:75e:c92d:38d4 with SMTP id d132-20020a37688a000000b0075ec92d38d4mr402358qkc.4.1685996590601; Mon, 05 Jun 2023 13:23:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685996590; cv=none; d=google.com; s=arc-20160816; b=ekA9ejbGoO8/CJ3VngXpKQdbUl4EBztjwV8OqhZIkawAZQm8e9xE3cW+hK1J0joWym jhsWRDrVIbgwCCMByhWPaTVizip1zf4u8TKozvbW5LshRp9qgqIuhJi1h175CsbFvwL3 X0h2ZluxM6UbNSMyv89nuQ7N1ZeQzfHcgiJikTYfB+GbASrxLhgelEGYqkrsn1kAv/ws 6Sb3uOg0Oendsy4/DlQ7UuqrJjjPNRvWUDRp7Lc77mpBDXk4digUCyIcrx+EGR0Ngsuo rXnrv3uc8kDLXfelno4TxYPcG6Fv+8027aOpQkDV6742+rjGnGPTj06eC3Vt8HmG2JoX q9pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yv/XPqbhv8nUeXb0hXO9bS/8b9QGtoWBmeHgg0dWk2g=; b=yFtCa20dCxzOsRrpnVf4u44Pb5EOcyLIdvc1Tgh3SCIksaRVjrgbJa8uUnp+//GKDp D/xK6IuKOH6CR/qeCKT+IY9k08i+fly4U/nAC4BGlu5xzzUMUm9lIB/YJigUFPLZLVrp yJQ2WEfMUC9uHWX98Q2Sqls/X5xz6LWS+l2qllkXhiL9AkE60jvyeBFxey8lEOZlWDS2 79WA3Gp79shW3yVChe61TPFM8pG7Qz9RVxv6XFxqs692gwiifyUEG97hGCbum0UVe4ft xv+z6LBE1K7ivXF0D5qeevbsrxwnmOBn6V554sq5T2MOfnLFqTZDIcVaRGGwjj3xTbBF 8XHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mceq8faz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g6-20020a37e206000000b0075cb4e1e38bsi5010437qki.446.2023.06.05.13.23.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Jun 2023 13:23:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mceq8faz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6GgP-0007z6-EW; Mon, 05 Jun 2023 16:20:05 -0400 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 1q6Gfx-0006ve-Sn for qemu-devel@nongnu.org; Mon, 05 Jun 2023 16:19:38 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6Gfu-0005mt-5Y for qemu-devel@nongnu.org; Mon, 05 Jun 2023 16:19:35 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1b00ffb4186so30783255ad.0 for ; Mon, 05 Jun 2023 13:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685996372; x=1688588372; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yv/XPqbhv8nUeXb0hXO9bS/8b9QGtoWBmeHgg0dWk2g=; b=mceq8fazmj1BbFrJ9pyZSLyj+m8ta2LquCTzxzegQM2tTy3e+VvWiT1Qe6qI/6NCRq fbarwypNWfz30nYWIIu3y9O9XLEh4C5FDGoIbZHN6S+erzZiE/AM1/UTP8oySF+n05q2 9L3jSgkJfvMYGD2w8yzQlR9siflu+O0J9P7EsdzkSgXkI1KVrOJpawhA+XPZIJ9OPLIr v2+9tmz0k+jGLc0lgYjKgGoNjGZnXizPbXqOLmjjjBYatCiX1RsV1fAo67LsTtHp6AM8 qbhBVSoc6c+CABjxhWtXngo11Qokpq3EmuZD61y42n9JXdIkcDF09MSqYbGZXEKncFc7 fi4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685996372; x=1688588372; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yv/XPqbhv8nUeXb0hXO9bS/8b9QGtoWBmeHgg0dWk2g=; b=ZxrxpTQYsrOQsjntgFN3wAK73oX7r6ouoZ+3mhVnKKLiRPRySZ4m3GDCQK+6im1iC4 pR0ovC1jF4Pm30e8Ui8b45tJYcCfbRPnuumLt8wT1r11MxoNgFP9I51LGWexdV2ZZ0p5 LpVBeA3bKSRUOFSkyeTWwJK3ACIGa0ZgmxGZUxNvMq4lXePpNdcPfXrfaf4eriMdbOnv f0yFrrUhD57ybJqxjcstTd2Mim7Lh+Ejg5v5C85OZNutCXnZQOQAfX3n9YXYlrjXSyW0 blkzMfffbr6qVHHIa4wi5zYw1M0t5gJwn8QOqfxVx7d0EPYm7abaQrTqwmKEJB0T+ZQn AtZw== X-Gm-Message-State: AC+VfDyiPtp2WqVOeeJ3lqI5ECw9/qKveVhXjJ7GL65V3ZmLgzgKJVG0 n94ZgpIPu40lSgwnGF73FNJqx7CYMHbWC+7/Sxk= X-Received: by 2002:a17:902:f802:b0:1b1:8900:5211 with SMTP id ix2-20020a170902f80200b001b189005211mr42519plb.28.1685996372260; Mon, 05 Jun 2023 13:19:32 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:3f85:a600:6a3e:e465]) by smtp.gmail.com with ESMTPSA id w20-20020a170902c79400b001a980a23802sm7018184pla.111.2023.06.05.13.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 13:19:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 49/52] exec/poison: Do not poison CONFIG_SOFTMMU Date: Mon, 5 Jun 2023 13:15:45 -0700 Message-Id: <20230605201548.1596865-50-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230605201548.1596865-1-richard.henderson@linaro.org> References: <20230605201548.1596865-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org If CONFIG_USER_ONLY is ok generically, so is CONFIG_SOFTMMU, because they are exactly opposite. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- include/exec/poison.h | 1 - scripts/make-config-poison.sh | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/exec/poison.h b/include/exec/poison.h index 256736e11a..e94ee8dfef 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -85,7 +85,6 @@ #pragma GCC poison CONFIG_HVF #pragma GCC poison CONFIG_LINUX_USER #pragma GCC poison CONFIG_KVM -#pragma GCC poison CONFIG_SOFTMMU #pragma GCC poison CONFIG_WHPX #pragma GCC poison CONFIG_XEN diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh index 1892854261..2b36907e23 100755 --- a/scripts/make-config-poison.sh +++ b/scripts/make-config-poison.sh @@ -4,11 +4,12 @@ if test $# = 0; then exit 0 fi -# Create list of config switches that should be poisoned in common code... -# but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special. +# Create list of config switches that should be poisoned in common code, +# but filter out several which are handled manually. exec sed -n \ -e' /CONFIG_TCG/d' \ -e '/CONFIG_USER_ONLY/d' \ + -e '/CONFIG_SOFTMMU/d' \ -e '/^#define / {' \ -e 's///' \ -e 's/ .*//' \