From patchwork Wed May 3 07:23:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678746 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp914376wrs; Wed, 3 May 2023 00:41:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4z8wR/k5Cjof4JUyWIc+trKkd0VkP8vxfubVFIKmVhoM6PTvDfaZZR0VYVy6+DgZ0o1+0L X-Received: by 2002:a05:622a:254:b0:3f0:a9af:8038 with SMTP id c20-20020a05622a025400b003f0a9af8038mr34403290qtx.23.1683099713931; Wed, 03 May 2023 00:41:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683099713; cv=none; d=google.com; s=arc-20160816; b=ybjxO/jNGu513eUCcHXf+UuumOSZVIjnRJXr5N53H0eAxXkSE63LWD6hICfjR+y5qZ oD5BCxy9b9Bml0MzSkjMLIZa5u4gOgNeNhFRWs+nYjJqNWT/5WYh4SznwsGU/6QJqFLm nIw2/Qh2ZVjPEzNdt+jt1YP5ptY4CzTBLx2IL/ehOsZtG3gLSZqhe6AyiJ4vhlWtak3m nFpfbMk4LSBw+glPIagAK42IHWWMfuIu1Ra/rYssQ2Q018eo1Wu8qFQzI1xD8kdJChDd dJVxmDC77K4G2RTAaCXma3XqUAZZwCOd68GCJ+7Gy1LXgReIqPQovPNrc5V4NjpdnIZ7 d2Lg== 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=PRmXJMFN3rYya2LUNfLtjvM1yMLdoZFGjXY4lJtw1jE=; b=itl4d7OVQ2d2Ky90NURjFsQyjUpbOpxQwbVZJeO/EZY/b6093zoItCqyF1rQ9kjJCe cv9zmdwyEEHVc+j4Qae5xovzhdxIjewJDIXq8Zl7GnCMcV85MkQrXvcg09tG5w16YYfP DK89HXjo8Kiyu1a2OIOZsfLhLd1B48b6uoAsrV4sai9C7pr5L69h3/Vub2cKuywCt4Qc L75Dk2Y9FbSBMYh+C9tPvfoOoOVr0gqrPeK76qCwWmEu5gP7tExzlIKZPxQA/Xx0zgbS tibQgFYDTbWXg/BkdCprULYwbNpKAHRJ15Gr3eR76lMmHmB+h1j/wuDD4WT8R7vgPMTy W13g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CyjiUZjf; 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 u12-20020a05622a198c00b003b82998915fsi3407300qtc.22.2023.05.03.00.41.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2023 00:41:53 -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=CyjiUZjf; 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 1pu6wq-00083s-HF; Wed, 03 May 2023 03:30:48 -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 1pu6wi-0007lK-TY for qemu-devel@nongnu.org; Wed, 03 May 2023 03:30:44 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pu6wg-00074h-EG for qemu-devel@nongnu.org; Wed, 03 May 2023 03:30:40 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f173af665fso30147725e9.3 for ; Wed, 03 May 2023 00:30:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683099035; x=1685691035; 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=PRmXJMFN3rYya2LUNfLtjvM1yMLdoZFGjXY4lJtw1jE=; b=CyjiUZjfq/aBlCcH6uNzbPFFhfWC9t/voWpKIsXD2f81BOnhqY9g6T94ioy8ZNs1Y2 RCywJUKPEeWwKDtpuAdBewvDkDvoqtQ8nrapNV8K2aSj1Og3sWN0XON2FoabtTMwXo/y 4A0FjBRcsGxJZpoxb9AuR2M2Y2eWh1q3HK+asw6t/LskY93+ZxXPhIyxKjxBTwTpHcQJ X+rpOV1eUK27cNEG3OYWdzij/mNh8KbU9UlRSvlxZWBiUl3Pgd9lEnvz1rUKbbSBBEPd d+G78yqr+1SaL26qHSMEQaZ/HCl0lcZEdnDadcLDAmdch0eji+AD/J1VCY5GS0O1JUV5 tMEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683099035; x=1685691035; 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=PRmXJMFN3rYya2LUNfLtjvM1yMLdoZFGjXY4lJtw1jE=; b=UpeYUfoSAx+p1TFbFefyNdwB6xx0x6xEJlVbksIKTISuJ3rSpJMNeSXYmvI9Gji0KP 6vy3ZKLvadnqUBgiqrKKmTup/O8b2Bb41RAs0PHrq9mVdwGFXNL37XWkhn1pX73ZmgIB 39o/o+DuUpozvnTKMffMdpeOlUSCiQL1yzmCmwqMP2MPe8KqGfQdbSz05/ubCDi8t7lK 5A+5ewzviW69EnFHNgdg5aK3lEcnGENQUr8jnTmLuJ6EQwMjRXfMVVRwA+S1rm5DbVBJ TAUqjhC0WzKndtgv/jO57/5tcHqh+xm8oDli6kYaevPCcewpdhaTmybiW4PELjmXQTHh t7OQ== X-Gm-Message-State: AC+VfDwg46ddb/MdmqegKX+ShIVY3djT3kzHc/K+GexwwOp2Gfsds9+m nzC9/fmm+FD+gN98F4kaQxSDQpeZ+JQ3frzSg1XPGg== X-Received: by 2002:a05:600c:b43:b0:3f1:6f3a:fcbc with SMTP id k3-20020a05600c0b4300b003f16f3afcbcmr14213836wmr.16.1683099035631; Wed, 03 May 2023 00:30:35 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:c01d:9d74:b630:9087]) by smtp.gmail.com with ESMTPSA id f24-20020a1cc918000000b003f0ad8d1c69sm982896wmb.25.2023.05.03.00.30.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 00:30:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: ale@rev.ng, philmd@linaro.org, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, anjo@rev.ng Subject: [PATCH 83/84] exec/poison: Do not poison CONFIG_SOFTMMU Date: Wed, 3 May 2023 08:23:30 +0100 Message-Id: <20230503072331.1747057-84-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503072331.1747057-1-richard.henderson@linaro.org> References: <20230503072331.1747057-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x330.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. Signed-off-by: Richard Henderson Reviewed-by: Thomas Huth Nacked-by: Thomas Huth --- 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/ .*//' \