From patchwork Thu Jun 22 09:33:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 694891 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1297018wrm; Thu, 22 Jun 2023 02:36:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4QmBTAUs55l+cGQOIVlALOPsQkYkdUNG7cIVaNYIgWF5BdW6m8Kt9MPqjG/C4LfF1RB0zp X-Received: by 2002:ac8:5c49:0:b0:400:790c:c5dc with SMTP id j9-20020ac85c49000000b00400790cc5dcmr1750286qtj.1.1687426580109; Thu, 22 Jun 2023 02:36:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687426580; cv=none; d=google.com; s=arc-20160816; b=rujwkszUovk6l3LLa98sJhuE2n5A9PUZ6S9edIoWmBCHawC1nvU8ANA2d+gO0r3hxT Laurs5Zku49t/lifFO6cAnXITMJ7kKOnDvtgPeSkjLy75I+ZFjAOd5TAqj7X1kXsmADI haU/D2K5LuHy5I2i+q9WpLZmwpQVgrMLmHEC8wZ89F9Ushs5czYzrUqqv0iWqZ8ZXYJo hTf7/GNwekZVI4+TYJpfjZ3Y1uJiwnyrf3lS1EgKRTZbNWDT2mzn2rjwcuyQ1KjeKHc5 PVB4v6pGz+zzEyGnQpl+sKY06d1+Zdrdq50AiiqKopHHfw6sXw5KIoqOFBxPUA9EBvG7 UMvw== 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=kWccjYSUgbzH7iFLpghJHKGPLA8F7swC2dsX7bfHZ54=; b=WiCUbjjTKyLLky1mOvAp8dmwPdmibCRaObt0CgHGeu9bZwfq3FBnxCvtAAopD9z4Wx 8Huuzrmd5JdooXFbMpIA1KyKGECr+Q5opOxsLLsb506pmSbitKA9aAOxsbeXrN+ZTNWU HI6a0DaQLSTxLJDiQIrUgAUGC721V1IqYLWXk42fpRvGevbj5/7xV2jqGChmUwSJN3TY x16Jb8QPh4YDP14/N7Tltq09sKluueOXTGCnZUpJa7AF5GTqgCZaEFJKVQFNT7nSbpF5 eRp7ix7pTVRSOTLzU1rnvaX7SaePv6ky6R7ukF780H/8OWJT52FcuQkIhsIKYhASPQhB aSGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=rDtYOTbn; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p20-20020a05622a049400b003ef3704f5dasi2486607qtx.463.2023.06.22.02.36.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Jun 2023 02:36:20 -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=@gmail.com header.s=20221208 header.b=rDtYOTbn; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCGhx-0000mj-7L; Thu, 22 Jun 2023 05:34:29 -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 1qCGhw-0000mN-EV; Thu, 22 Jun 2023 05:34:28 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCGhv-0003Qm-0Y; Thu, 22 Jun 2023 05:34:28 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-666ecf9a081so5143734b3a.2; Thu, 22 Jun 2023 02:34:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687426465; x=1690018465; 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=kWccjYSUgbzH7iFLpghJHKGPLA8F7swC2dsX7bfHZ54=; b=rDtYOTbno9xDsTG69Nb4AiFnRFuOnz+Kjv+Us4bz0rH+shVIY7JXJo/AHwriYZkh4p PsDKqLTTyBkOT5sM27phnRGoZdgFEMxsl1OhsetRK+8FleosHPkDxeOOZmc547M6mnu/ v9EMjC458DLE3UJFhzxsJi/+vo2/qhr0z5Or5mE/HUXswt1qG9OVMUsyT+Deei2Q91wp 58pM4ylFoFafv4Z5aqSpQGFFN0pxdBE02o4RpL+ADjUYhxliG2M/YIjUlvlLPaLIMZ+6 46d6/ut/D/bhOHIsKrest78ILbUngWnK6JRJc2sYKGBR3lgD4Ftut7mP3NGDT6u9LoUw +PWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687426465; x=1690018465; 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=kWccjYSUgbzH7iFLpghJHKGPLA8F7swC2dsX7bfHZ54=; b=FexkPQf7mu44QxSYsdKDYMGXnpDzuCbO9MFZ78L3nCOnZtf6JFMa8gWTxJtBfHCzIX bPp+Bmjg1KN6iB4hSeXP6PIN77VmOZkhQMkgbVV5dx6Vq+bVUqPbefXhn0+HQgyuZeoF zRNK9Nx6kt+FeDg2AwDmQ/SEnldYsBgOJzLHSuy+4EFfzxo3Wj005XLqgaceCsOUjKFf eWmdgAcC80s0CJe9UYsUaTa7/CVtZ7Vo3vG0INvuSsL9b90pRL5h/ITTlKt88+wPq+qc s7oMJ2puVesxcOSsvrvCnkeyNCp3/zPBR2/PDIitYM1Sel3+DS+xPrDve+rQd2d1Uw4p H4qw== X-Gm-Message-State: AC+VfDzLbL7n2ktqI3RSNcQ5BThdKOpHwnnJBziLmPL4LUGLpE+fkHDj jq8KvHZM1hYM/hVQpD/CYb1Q8e3/7Ho= X-Received: by 2002:a05:6a20:244e:b0:123:6ab3:7af1 with SMTP id t14-20020a056a20244e00b001236ab37af1mr3817978pzc.6.1687426464880; Thu, 22 Jun 2023 02:34:24 -0700 (PDT) Received: from wheely.local0.net (193-116-203-37.tpgi.com.au. [193.116.203.37]) by smtp.gmail.com with ESMTPSA id x3-20020a1709027c0300b001ac2c3e54adsm4925662pll.118.2023.06.22.02.34.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 02:34:24 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Harsh Prateek Bora , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , David Gibson , Greg Kurz , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/7] hw/ppc/spapr: Test whether TCG is enabled with tcg_enabled() Date: Thu, 22 Jun 2023 19:33:54 +1000 Message-Id: <20230622093357.255649-5-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622093357.255649-1-npiggin@gmail.com> References: <20230622093357.255649-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=npiggin@gmail.com; helo=mail-pf1-x431.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, FREEMAIL_FROM=0.001, 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 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 --- 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 e55905a1f0..8e7d497f25 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;