From patchwork Tue May 23 13:53:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 684992 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1744396wrt; Tue, 23 May 2023 07:16:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7RZNUY/neulwTIUyR/yWXLnAzSRZzkMzOaKUjEcvTL9s1CboM8Jw8JPBex8LGPrWsmSw88 X-Received: by 2002:a05:620a:22c9:b0:75b:23a0:deb5 with SMTP id o9-20020a05620a22c900b0075b23a0deb5mr3635906qki.51.1684851383236; Tue, 23 May 2023 07:16:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684851383; cv=none; d=google.com; s=arc-20160816; b=mj93ZzqCOFbsps0/pQXVtC/wQ219fV7LG7+zwjOMAs0sWB7zQc78zgSL2Pf91AtGC6 lW0DKxqcgEilYA2QXqtqX9azqRcEbiOA59E4JEi3OEJEkyYjAlyBCVT4Mi8mtRs8IRzX Ntty62p+cxxYLvdoKctETHZsvg7n67kD31NeBYBO+W7nT/XiCDqXIbIdLXWyrB7bHEpJ UzoScjB2BzLQr4GxBcO1XQy8wSd+gmCiAAruizBi57QmzdzcvuTI+YDDRFhPUHL8e76y 7J6r0i97EYLrEaEGhv1VQNk8Kv5EC8xlhCQPVoNnUAFc4zBGWHif+dgzGfl84EWd/AGU Exvg== 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:to:from :dkim-signature; bh=PRmXJMFN3rYya2LUNfLtjvM1yMLdoZFGjXY4lJtw1jE=; b=01XW0wm3fw+tC2t+QcczXsn5/YZYbMyd7dFHQAulYmjFwVLJThAOSjASJjDlaq5rFU jLT25EjSgFsPt87Qn6SIn5Yva2ie9GRg9CQCZhpP8XgAagdfediKPHS2l9HE0Hrg2Goq ZnV6ELiA/RdXLIvQoBaCIKpMwnVNIB7zDROB2loZvE27VisPTeFpCbKkcKmas2Yj3BY4 ZZ1F1LCmhZgmTdAFCRDbqlqnZlpl2K8TNDQwoCfPJbfdG3PN/xCDrgjud9pd+gbLbXh6 m/y1Qcw0eiIv0313jGfRQyV6jW5YfZtJuPrKH9j2iobbvrqcGR7M4bcdJO1/TP9jK/nU fcKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fhbY9Gl2; 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 gm15-20020a056214268f00b00571f474a2desi5219881qvb.349.2023.05.23.07.16.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 May 2023 07:16:23 -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=fhbY9Gl2; 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 1q1SVp-0003bM-1b; Tue, 23 May 2023 09:57:17 -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 1q1SVm-0003WQ-Jd for qemu-devel@nongnu.org; Tue, 23 May 2023 09:57:14 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1SVe-0004BV-Pz for qemu-devel@nongnu.org; Tue, 23 May 2023 09:57:14 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-64d1e96c082so4215138b3a.1 for ; Tue, 23 May 2023 06:57:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684850226; x=1687442226; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PRmXJMFN3rYya2LUNfLtjvM1yMLdoZFGjXY4lJtw1jE=; b=fhbY9Gl2HgEsCvEI3gzEY+YcjLrGDqywmivCg2PzNxrTjXFmUd7jQX3TTY6eCZ5Ezx aKR+nrXzyRVfTFRGopPCq03uEVXbtPoxXEwF/dGxR7LUwrCYyQTFyLRJd8qlvm4uA1dr 9rSkpG1iDMzgi4DtLNFUJ6GUR4E92kzjyeNb2DwAeFXb4Du8RE4PLrdvGkcUXar79Oyj AWf0FeOJLSO/slUhVagKOMD+y/PEr0qyLiKOWKxyIBucGe6XQtSyPrdf0hhNxpNJbCLl HDH+cK3KV0zKXKnta6LoNGDl1DnTLqJo2vGaE3tclzwWwutZps7MKRvlO1aSxSCxYcdx 9wMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684850226; x=1687442226; 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=PRmXJMFN3rYya2LUNfLtjvM1yMLdoZFGjXY4lJtw1jE=; b=kpCS18qM/pQ6r7rcJ8XYjIhtybqDJ1QDTjTVrFjOOaws2SvUpnhGge2aLLeOkZAG07 X8dlU3HjE5wTpXr0QeW9xQeRBYHfJhoCkXA16lA/isOAl1l29VooOQIH5z3F6TJr1/pQ zzhVKuChxeLYW3S1tX31mp/PGXxy45e9sdRxJQgjFYoGWt4F/6wDlseERvPac+K8nDC7 UoWdamLEzEmbwD8pKSmDvLqtMCDaGQLDkJq4Ty1G000sCD9/58DezSTX/unHV0NStYSj fKPD9YykBpCaIgl41Szw0erhxzw3lPZyaVrpzyaylh+3+ltjOcMSERfkqLyCZ+FP3RVe LVKg== X-Gm-Message-State: AC+VfDy90S4RJMgwf8j1CE4UP89ESn5nQBvyNu9Ngf1qFZXBCGb7zjSw nRcv1FSJYPlRtGkCoJeITV+5X9yrXV+/h3z5LUY= X-Received: by 2002:a05:6a00:188e:b0:64d:3227:b800 with SMTP id x14-20020a056a00188e00b0064d3227b800mr19126746pfh.16.1684850225438; Tue, 23 May 2023 06:57:05 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:c13a:d73:4f88:3654]) by smtp.gmail.com with ESMTPSA id v11-20020a62a50b000000b0063799398eaesm5805790pfm.51.2023.05.23.06.57.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 06:57:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 51/52] exec/poison: Do not poison CONFIG_SOFTMMU Date: Tue, 23 May 2023 06:53:21 -0700 Message-Id: <20230523135322.678948-52-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230523135322.678948-1-richard.henderson@linaro.org> References: <20230523135322.678948-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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. 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/ .*//' \