From patchwork Mon Jun 26 05:56:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 696431 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3063691wrm; Sun, 25 Jun 2023 23:10:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ53QScVPzyKKyoaWqUv+fnsL62cWF1y1JHM/j6UIeVKfCU/qzflaLsu/NrhLNUgV/3NjdQF X-Received: by 2002:a05:6214:f08:b0:623:6b1a:c5f1 with SMTP id gw8-20020a0562140f0800b006236b1ac5f1mr35421432qvb.4.1687759804566; Sun, 25 Jun 2023 23:10:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687759804; cv=none; d=google.com; s=arc-20160816; b=KgMYZnkkWRO7z8DhtFlfqH01xNUQlW2JjOO4v7trPl9TFd/J7UBaW5YI/QUcd+5ccn 7yxcqome9gzOqA0DDrDWPoBcpWw7+Be6HpluX9aQCAafMsg5YosbSCkroL/Eg6LYOHzs 7M9yUn4kdgHthi7VVhf6NwN5AXDhkHMmPhCqtWReSgBhNlH5qh23MhNw87oZYh+NPDO8 umeM/Na5AVZzCQ19UKuAlsMkLk7pYXVU+YQZBcj3QXMpulfMxPOVDQRQP9N4Vi4zBNWc yp92jVhGNVNIGtWYaD0M86GMMTetKreNQQPtw6tY+t7qZ0PCDkTtPujptp7uL0fttwo3 YRDA== 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; bh=VzwrceBmFZMzVoNjQEmL7lR3AWvX1XgmEfWMnqjn1zw=; fh=oFEYy0q/A+q+sgu+JN1+spxDJoVU3l2dg+Z/DGBZBo4=; b=DA2sjpAh55jMCummFSjTducuu3JDL3wrzhiz9o9oDt5bxeNWt+8qegssy/8wUoOoq4 cVl9ommUTgIIJJPMrLTA7pEiPUiVRmtGBCLMjWfSBoCGpnTgBok0qtTeHY73dIaGWLR6 8Vhc1xfcCzlbP0gprXafMJ1tvcf/cPElIoBsnnF+DyoUjzcjy1Luv0KCDLWJqTx/gydq lwVlKbGyBjIdA5WsyN5MXiQUnKojMwFA0eW45E89UZ0pWGJt3jhuV+EmF73nUhO7AHvb Bqld2CU/7cSIIxf+2ntRJlsw8w9Tscipesp0qkpEzUdcOHuNvtURZ9Uu1zqzranr+AKf 3Mdg== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jr3-20020a0562142a8300b006300a43cc1csi1753164qvb.433.2023.06.25.23.10.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 Jun 2023 23:10:04 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDfFI-0005XQ-Mf; Mon, 26 Jun 2023 01:58:40 -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 1qDfEp-00040S-Or; Mon, 26 Jun 2023 01:58:12 -0400 Received: from gandalf.ozlabs.org ([150.107.74.76]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDfEo-0007ep-6R; Mon, 26 Jun 2023 01:58:11 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4QqHFW6Xrsz4wb3; Mon, 26 Jun 2023 15:58:07 +1000 (AEST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QqHFS3lpVz4wb1; Mon, 26 Jun 2023 15:58:04 +1000 (AEST) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: Richard Henderson Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Greg Kurz , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , David Gibson , Nicholas Piggin Subject: [PULL 24/30] hw/ppc/spapr: Test whether TCG is enabled with tcg_enabled() Date: Mon, 26 Jun 2023 07:56:41 +0200 Message-ID: <20230626055647.1147743-25-clg@kaod.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230626055647.1147743-1-clg@kaod.org> References: <20230626055647.1147743-1-clg@kaod.org> MIME-Version: 1.0 Received-SPF: pass client-ip=150.107.74.76; envelope-from=SRS0=U+Ap=CO=kaod.org=clg@ozlabs.org; helo=gandalf.ozlabs.org X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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 From: Philippe Mathieu-Daudé Although the PPC target only supports the TCG and KVM accelerators, QEMU supports more. We can not assume that '!kvm == tcg', so test for the correct accelerator. This also eases code review, because here we don't care about KVM, we really want to test for TCG. Reviewed-by: Greg Kurz Reviewed-by: Harsh Prateek Bora Reviewed-by: Cédric Le Goater Reviewed-by: David Gibson Signed-off-by: Philippe Mathieu-Daudé [np: Fix changelog typo noticed by Zoltan] Signed-off-by: Nicholas Piggin Signed-off-by: Cédric Le Goater --- hw/ppc/spapr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e55905a1f068..8e7d497f25fa 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2525,7 +2525,7 @@ static void spapr_set_vsmt_mode(SpaprMachineState *spapr, Error **errp) int ret; unsigned int smp_threads = ms->smp.threads; - if (!kvm_enabled() && (smp_threads > 1)) { + if (tcg_enabled() && (smp_threads > 1)) { error_setg(errp, "TCG cannot support more than 1 thread/core " "on a pseries machine"); return;