From nobody Wed Oct 29 17:31:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524823628787286.45469734864093; Fri, 27 Apr 2018 03:07:08 -0700 (PDT) Received: from localhost ([::1]:46952 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC0HT-0003Um-3x for importer@patchew.org; Fri, 27 Apr 2018 06:07:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBzav-0002Yo-UV for qemu-devel@nongnu.org; Fri, 27 Apr 2018 05:23:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBzas-0002Tj-RE for qemu-devel@nongnu.org; Fri, 27 Apr 2018 05:23:09 -0400 Received: from ozlabs.org ([203.11.71.1]:33061) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fBzas-0002SE-Es; Fri, 27 Apr 2018 05:23:06 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 40XT2v0ZQ1z9s7X; Fri, 27 Apr 2018 19:21:38 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1524820903; bh=MK1b+rBjAZy6r3XcbwbT9qEr7KE/+bRQFXtrMSQ5wFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NxA7hBY6kDZFv1FeznzfuYekrPUo8uHgWgcAUolBUitamJCud9BWiUEBGN3GDsl6o Ui5N3Ja6Ot7CpYFoEeO5lxUxRBaIfVqfan/6P3Joi5MLvS0R3nWbXutHWppJKWWGRT nfGziG9i90qk+XsxaLi0Ijd8Y6v9bPOKRfj41uZI= From: David Gibson To: peter.maydell@linaro.org Date: Fri, 27 Apr 2018 19:21:09 +1000 Message-Id: <20180427092126.24812-33-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180427092126.24812-1-david@gibson.dropbear.id.au> References: <20180427092126.24812-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 32/49] target/ppc: Simplify cpu valid check in ppc_cpu_realize X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Gibson , qemu-ppc@nongnu.org, groug@kaod.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The #if isn't necessary, because there's a suitable one inside ppc_cpu_is_valid(). We've already filtered for suitable cpu models in the functions that search and register them. So by the time we get to realize having an invalid one indicates a code error, not a user error, so an assert() is more appropriate than error_setg(). Signed-off-by: David Gibson Reviewed-by: Thomas Huth Reviewed-by: Greg Kurz --- target/ppc/translate_init.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 56b80a204a..2ae718242a 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -9749,14 +9749,7 @@ static void ppc_cpu_realize(DeviceState *dev, Error = **errp) } } =20 -#if defined(TARGET_PPCEMB) - if (!ppc_cpu_is_valid(pcc)) { - error_setg(errp, "CPU does not possess a BookE or 4xx MMU. " - "Please use qemu-system-ppc or qemu-system-ppc64 instea= d " - "or choose another CPU model."); - goto unrealize; - } -#endif + assert(ppc_cpu_is_valid(pcc)); =20 create_ppc_opcodes(cpu, &local_err); if (local_err !=3D NULL) { --=20 2.14.3