From patchwork Tue Dec 19 19:12:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 755969 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp1602093wra; Tue, 19 Dec 2023 11:18:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7ubOC7FHL4Hr/2Vhbzxu0RNwzNilAliRLqIe3Ed52q9q+9pohFtfOzgngUaFO7jYROYIK X-Received: by 2002:ac8:5bc3:0:b0:427:8436:5b56 with SMTP id b3-20020ac85bc3000000b0042784365b56mr326895qtb.38.1703013483240; Tue, 19 Dec 2023 11:18:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703013483; cv=none; d=google.com; s=arc-20160816; b=bpHNjHbjl/tU4z32/X7bOU2zfA28BvllpYqvQsbDB/YVZiHEo/vJLRg4K4VwVMyMt8 Wo8rjWdKKUa9riNaVaFVmUxidia+qcVUVOCtQBB28wmM81OHWKcoDK9pXUL84jlEtIfL KbZ304mvl1LgSBAmuS1U+g3BMGiSW3IDuRbSotq9SM/a/5YsEyWTi8Odiqwz9LHGX5+5 0h4RsWHrZv7M3+R1EbeH711baMO94VSttsfItDeqe8u89mFhIC40tXgBPpjbjTVYzP+4 B09ah+y1K/q2tgrfRCqcSAkVWcp5bcBqOWintxPCIR97iDWNLTVLPDYClsexfhpydTvG iovg== 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:to:from :dkim-signature; bh=DxeuhpipM3BEPBaMclMGluLt2DuQa6fF5XvciTbwcOc=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=HEB4KFJ1RFIMc5krRxuwo57L8el0DJpyz9OArtvrSOWf20hnON7moigOUdgKA1Rfzo k78f6kEWp8vQfwunz2Aw11Q5R5A70R62BZpWA0hb+iFpgiZO3wLbzj+AAqPRz6xjTGW5 ylHE+BXKeogB6vgoluGgAlASDmJeJP/t4e/j4c6r6lz68qXhz03IrM1ghoF/O0ptbJp0 bKLp7x2zAISTcHTODXp/bLp5GB07okXD2WbCRw0155rHne6RfLAM1ihXgyerXn96lrm+ mS7PE4wGCQrFkGVTYrDN+6okb/zIqJhUCVTAypfKlf0SaCtf6miBpZch4aPn1XuBWUv3 244g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jPP4v1YF; 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 ff12-20020a05622a4d8c00b004254402dd27si27851823qtb.399.2023.12.19.11.18.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Dec 2023 11:18:03 -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=jPP4v1YF; 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 1rFfX5-00020p-B5; Tue, 19 Dec 2023 14:13:35 -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 1rFfWz-0001yT-Tz for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:33 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFfWw-0001s0-KK for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:29 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40c38de1ee4so49391895e9.0 for ; Tue, 19 Dec 2023 11:13:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703013205; x=1703618005; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DxeuhpipM3BEPBaMclMGluLt2DuQa6fF5XvciTbwcOc=; b=jPP4v1YFt8FfLAPiWsSUpcKCpTCeuZa+i2Pb7sbkqp1HTKtsQF3Jt0THmhoN0FNsai ZIcEGJXVHv+4pZ/4VV/A9hgozdaQFBvEVHAV7B5Cl9vCPNNVmLW0ek02riSL0hUKclin pXelxT4NE7QCLhWFtcsTafzdMxDUpPy+rXJl460TPF2XE+OKmj+XIFrrvRY0tjnQ1Njc xPDcVjwxKkKlIXaEQfXXpfsq4OuF47uQr899WOXEzP4UblNOZeT2Blkn4/SY5kp4zGeZ EZ3nNJKRJqkuN9uaOYc9WcLcg4uXevoIIEGCe+qoEvNsYBdRUtCpDnOk8jFcYjI0vNL4 GAcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703013205; x=1703618005; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DxeuhpipM3BEPBaMclMGluLt2DuQa6fF5XvciTbwcOc=; b=D02BE4GD0KyNAyr4hzJhIRhU6fL7ozE1N+7kOtDdMPAwsHK6pDRByyY9EWkMIxzc/G dqEHKqEyEbt3Q0GmOcYBgbwVN+7xUUlT0zdvbFMqVsWRMbzul4ALyD1CUJZq+JJCVzWK 6VfhZfSxlVBENVp4aQaoXtpx3B16T1l1dK4L1fGI2mnyDaj3fMDexuhcuSjtNFR6UjcS YaVYKddMm7Smg4C0Ly6hb3H3h8qYIhRbts+vdI+IFZOXFMlaPMMXBVfhmY3u3o7Tw1mh f8QBxwxJhPnXdhLvpfyWbeBfWkgeul+pC1YE/fPhwlgpM+hZfWen9ezY/TVuMUs8554G CNCg== X-Gm-Message-State: AOJu0YzxGfIpaby5yfRwrzbY+rtEcbrM9MBsL1rUL2TC144K718fUeQ2 Dn+EV3YsOskFD6rGvJUEnoL3+iS57ZbxaJFWi6U= X-Received: by 2002:a05:600c:b41:b0:40c:2a41:4a35 with SMTP id k1-20020a05600c0b4100b0040c2a414a35mr9594728wmr.130.1703013205339; Tue, 19 Dec 2023 11:13:25 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f5-20020a5d5685000000b0033657376b62sm12007754wrv.105.2023.12.19.11.13.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 11:13:25 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 33/43] target/arm/kvm: Have kvm_arm_[get|put]_virtual_time take ARMCPU argument Date: Tue, 19 Dec 2023 19:12:57 +0000 Message-Id: <20231219191307.2895919-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231219191307.2895919-1-peter.maydell@linaro.org> References: <20231219191307.2895919-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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 From: Philippe Mathieu-Daudé Unify the "kvm_arm.h" API: All functions related to ARM vCPUs take a ARMCPU* argument. Use the CPU() QOM cast macro When calling the generic vCPU API from "sysemu/kvm.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Gavin Shan Message-id: 20231123183518.64569-13-philmd@linaro.org Signed-off-by: Peter Maydell --- target/arm/kvm.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index a2370bc5747..5973fbedde1 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -1034,20 +1034,19 @@ static int kvm_arm_sync_mpstate_to_qemu(ARMCPU *cpu) /** * kvm_arm_get_virtual_time: - * @cs: CPUState + * @cpu: ARMCPU * * Gets the VCPU's virtual counter and stores it in the KVM CPU state. */ -static void kvm_arm_get_virtual_time(CPUState *cs) +static void kvm_arm_get_virtual_time(ARMCPU *cpu) { - ARMCPU *cpu = ARM_CPU(cs); int ret; if (cpu->kvm_vtime_dirty) { return; } - ret = kvm_get_one_reg(cs, KVM_REG_ARM_TIMER_CNT, &cpu->kvm_vtime); + ret = kvm_get_one_reg(CPU(cpu), KVM_REG_ARM_TIMER_CNT, &cpu->kvm_vtime); if (ret) { error_report("Failed to get KVM_REG_ARM_TIMER_CNT"); abort(); @@ -1058,20 +1057,19 @@ static void kvm_arm_get_virtual_time(CPUState *cs) /** * kvm_arm_put_virtual_time: - * @cs: CPUState + * @cpu: ARMCPU * * Sets the VCPU's virtual counter to the value stored in the KVM CPU state. */ -static void kvm_arm_put_virtual_time(CPUState *cs) +static void kvm_arm_put_virtual_time(ARMCPU *cpu) { - ARMCPU *cpu = ARM_CPU(cs); int ret; if (!cpu->kvm_vtime_dirty) { return; } - ret = kvm_set_one_reg(cs, KVM_REG_ARM_TIMER_CNT, &cpu->kvm_vtime); + ret = kvm_set_one_reg(CPU(cpu), KVM_REG_ARM_TIMER_CNT, &cpu->kvm_vtime); if (ret) { error_report("Failed to set KVM_REG_ARM_TIMER_CNT"); abort(); @@ -1289,16 +1287,15 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) static void kvm_arm_vm_state_change(void *opaque, bool running, RunState state) { - CPUState *cs = opaque; - ARMCPU *cpu = ARM_CPU(cs); + ARMCPU *cpu = opaque; if (running) { if (cpu->kvm_adjvtime) { - kvm_arm_put_virtual_time(cs); + kvm_arm_put_virtual_time(cpu); } } else { if (cpu->kvm_adjvtime) { - kvm_arm_get_virtual_time(cs); + kvm_arm_get_virtual_time(cpu); } } } @@ -1879,7 +1876,7 @@ int kvm_arch_init_vcpu(CPUState *cs) return -EINVAL; } - qemu_add_vm_change_state_handler(kvm_arm_vm_state_change, cs); + qemu_add_vm_change_state_handler(kvm_arm_vm_state_change, cpu); /* Determine init features for this CPU */ memset(cpu->kvm_init_features, 0, sizeof(cpu->kvm_init_features));