From patchwork Fri Jan 31 21:04:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 861012 Delivered-To: patch@linaro.org Received: by 2002:adf:fb05:0:b0:385:e875:8a9e with SMTP id c5csp928642wrr; Fri, 31 Jan 2025 13:06:22 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVQWkhB81GrZ2om2VXHzvUGWjy3YDe6ElF1h8LBBUmqqA0Rly0HIE5s0TFU0eq0lV/pr2BS+g==@linaro.org X-Google-Smtp-Source: AGHT+IGMmx/D8gLBY6m84e+DBO2pgWXUZW4aHE4a3aVfGbU5n1j8bLUuZgFPeDf2UnFoODcYUfGl X-Received: by 2002:a05:6102:b0a:b0:4af:4902:153e with SMTP id ada2fe7eead31-4b9a4f50f7dmr11305326137.9.1738357582530; Fri, 31 Jan 2025 13:06:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738357582; cv=none; d=google.com; s=arc-20240605; b=OStS8Vavze/dp5TqJvPGLLTbYJrrxFYksIqgxgstLdzR1HCHvK94angMxAVN2D6/d8 BsADyILXczrRy4vdtRatAzWuSUsn3QWl3lfbjo3cLE5Vi2kbwmVBj57gM/SJzx9vIIQL kxH8caG9qBPiut0oP+eGDwgkFWjlT8HTlYIlJrrzW4+roVsIZvXDbullzXnmcdqfVmeX K4nX0bnqQpG7DbMjRsGWoKNUmsc4dbzrFfLdJ5DZS0bF2R0piyA58woaHJZSg1edwu7L It4dm9mB09057bODd6RDuG4PzHlpOafmD64x/U67j+PXC8+ZdoVMK8/qSakyOAvWviCl dP4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=zkI1x48a89NKwPE68PZIsmK31RuXF94y4KuLgkd4bSM=; fh=qtn8prgQtzf5IzCNvLChUZDElvNECP6ej9YfjQeBz3I=; b=arGLrILghz/9Je272TL/2w05Vhg432IE5YuH8tH/RCA2d/YrjVbcinBvDVAvNDAWJW JC0olhS+/kvG/TnOcBoUZa8cq6Dh5jKr7g562MtIP/vNHSFV8vx5fNqo1LvJyXUzwS+/ 50JgPx1SbeeMPwhj2BczRaYdT+tT9WayKid3VwVMG+VNS3PUSs+9M2FDbqflVumsCu16 3mQ57CemJCADWY0gj5pWAGrpDdr/LBx9CeKHTPRL3kUohcsN65/CjIsXRragOLRtc7mN 2urPYrVzQwCQje2PMo5k9eH6aL22xo9ezdOw3+AeLFqyG3b+NximRbkFgQGvAQNKU7cL y6wQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fYyAMrsA; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4b9bad87dfasi1052341137.228.2025.01.31.13.06.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Jan 2025 13:06:22 -0800 (PST) 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=fYyAMrsA; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tdyD3-00063g-W3; Fri, 31 Jan 2025 16:05:54 -0500 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 1tdyCz-00062v-HR for qemu-devel@nongnu.org; Fri, 31 Jan 2025 16:05:50 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tdyCx-0007nk-Vi for qemu-devel@nongnu.org; Fri, 31 Jan 2025 16:05:49 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-438a39e659cso17376505e9.2 for ; Fri, 31 Jan 2025 13:05:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738357546; x=1738962346; darn=nongnu.org; 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=zkI1x48a89NKwPE68PZIsmK31RuXF94y4KuLgkd4bSM=; b=fYyAMrsAj5uZZK+75jrb5P9sO90fr16Pb/Iv3WGK8OuMYYb2U9iSKpVXcXam82Sq0P rW3JIszyhN0UPAdGTkFCK0t/BFxQNOiC/qeu8G+72DW42wMHVXUoaJQtdopeloA8aTA4 S4RkpclaPgniWSG2zFgUJCPgiFq+zKpalL+jBdhD6Sw63CwJN7ezXjVBRXKlWplD4L1L rqUk+USQkrUiinSBynOXAhbMM1whmdfKFyyohIid447l1PMxcyjffB+FfAOqC4+IXJql BVnsiMkDTogn+BaYAXK+CnFrtpsPZpfQ79MtjJ737SaI1hOClq4/PztX2D/ULCcIgGn1 edrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738357546; x=1738962346; 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=zkI1x48a89NKwPE68PZIsmK31RuXF94y4KuLgkd4bSM=; b=Yk+js7z1Um0Q66T/db0zr+buMd5Zroi0HxTWoXKMb7h/EHtJNNmRoIv4d7r5IBhrVF gQUIz095HRgcTfr19baQ8RqCHokRf+17Ni6kzWYgfbwoayf2kqLQnzMGHT4kfQCpxHPH 5AbP9nxG9hdRngh9afl3Y9Nlr/AYvsenrMqD7ThdBXs201DcZVAkUg6NzUMW8kdrrNDU 8TxkAdf9ZB9AtyGiF6o2fDZitkfUDva+pLiVSS5Hp8WRkRitVnxWvuAf7rx1BrV7TWKb sjwbcuU6Ia6YaV7asQPtQ85IWg/PyMiXdZ3FF2XCLtFQiNJ1OPcH/N8WJrcdr2+1gupF C/0g== X-Gm-Message-State: AOJu0Yw3Y0RmBkzl9OATTfnSpCykkaJNtqLMkEqEvUEDY00XhBXH1Btr 6l2mN82AGxdgXGf8jVemCvh4+Ubge8gWM+Bs+/X6UxFzi15D+c697TqWxVm6JW9No2vKK8fYNUx d3IQ= X-Gm-Gg: ASbGncvcggkLiJxN5jvwPakyY4Jm8M+CCZmuVySn91zAGS0gxq5g7S10aao4yk2HX7s 2v+ZgTlP5pgXpBCNKSVcIjICwxYGxl4s7fIKMyJ+e4JDnf0SdH9NqhN3PPuET6iG1AKJkHTt1lm oaHYrDTMNIum31baTosdDp4nFEIWY0lRxtNfRwaxJVlOYuJ4LRoNuF+zk73qU0y97+ZFpT4xK69 bvLxKlohVJGt1wNex+3TN1o+Qb/JwRe9+PwziVzg1bU+GmDeditoaV5fZFdHtogjTagwXAmkarI EvwWyDCDlbKIzQeRCJCUpH+X79B2FDmJ2ocyEpu+5jdlT79q4zl1ZlC0jYqFoYTKXQ== X-Received: by 2002:a05:600c:a45:b0:434:f7e3:bfbd with SMTP id 5b1f17b1804b1-438dc40cf15mr105997925e9.23.1738357546296; Fri, 31 Jan 2025 13:05:46 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c5c102bccsm5501317f8f.27.2025.01.31.13.05.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 31 Jan 2025 13:05:45 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 05/36] hw/mips/loongson3_virt: Pass CPU argument to get_cpu_freq_hz() Date: Fri, 31 Jan 2025 22:04:48 +0100 Message-ID: <20250131210520.85874-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250131210520.85874-1-philmd@linaro.org> References: <20250131210520.85874-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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 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 Pass the first vCPU as argument, allowing to remove another &first_cpu global use. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20250115232952.31166-5-philmd@linaro.org> --- hw/mips/loongson3_virt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index 45a524cca89..9f6fdd0f287 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -153,7 +153,7 @@ static const MemoryRegionOps loongson3_pm_ops = { #define DEF_LOONGSON3_FREQ (800 * 1000 * 1000) -static uint64_t get_cpu_freq_hz(void) +static uint64_t get_cpu_freq_hz(const MIPSCPU *cpu) { #ifdef CONFIG_KVM int ret; @@ -164,7 +164,7 @@ static uint64_t get_cpu_freq_hz(void) }; if (kvm_enabled()) { - ret = kvm_vcpu_ioctl(first_cpu, KVM_GET_ONE_REG, &freq_reg); + ret = kvm_vcpu_ioctl(CPU(cpu), KVM_GET_ONE_REG, &freq_reg); if (ret >= 0) { return freq * 2; } @@ -633,7 +633,7 @@ static void mips_loongson3_virt_init(MachineState *machine) * Please use -L to set the BIOS path and -bios to set bios name. */ - loaderparams.cpu_freq = get_cpu_freq_hz(); + loaderparams.cpu_freq = get_cpu_freq_hz(cpu); loaderparams.ram_size = ram_size; if (kernel_filename) { loaderparams.kernel_filename = kernel_filename;