From patchwork Tue Dec 19 19:12:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 755968 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp1602055wra; Tue, 19 Dec 2023 11:17:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IF5ysMCKxhAnY1AdouAr+Z8Wl1ZV/2Aac542EZSbjQS9s+iImfOrPyCkZ74Pw26jX6Mvz74 X-Received: by 2002:a05:6214:4119:b0:67f:f78:a509 with SMTP id kc25-20020a056214411900b0067f0f78a509mr12902500qvb.13.1703013477884; Tue, 19 Dec 2023 11:17:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703013477; cv=none; d=google.com; s=arc-20160816; b=uobMPXGn5+Y3TfRN9iGBF5AJlSv7ITXNa+1+cWQNjlW2Di3ARr99KwpSTg6pVDOGNi hzajTb0HKZW7hcVLGwDdOIBi9FIKjEldPw47JlYOYNkH/cJe+xDCpD20PpQcqH/AupU5 pWlsBlweaaSCtguffa0XHop82gFbH/pO6bMUKX4G1nxqDNn5Zt0ussPBezxKpzfAOTsK xoL2z0JGoS0tDmM0rvrfJONV97B/zlihAXoCrXI6w7xH2R8HGJiAPb4YgUvRBCj2hjdA i1lKohXtiyFPmGKytLNfUxTa+Ys0o72xy8+fkx6gSMf6J2YWjau2lFqkBzMphn65F6Kf jMQQ== 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=u7RSwDz13+9sv6W+3QlIzSQPKzKTiI3ycp67owFhcNM=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=ahFqcIOgYfI1h8AuXsrPIUijXf3bRR3rfFa7KaKGN1NNn5qLtuJVzed2wRXEb4NXBs 1OrpiPm6UfEF8gB7Yur4e7U43a6nWkSUG4sYvOlqAYfwQsaYjNXHfd6FQQ/3vOsfAMsd gHLTtGZk5YgT+XFpOwFxsgaM9A5pukR6LuG3lfBXRzioZNpwzmxVPKhON4ay2YUqlj9e 1P7XOYElQZrYjA2Om8JMfZLn61AOlaubZbBcNx2Rq8n8zRZZx3yLuz7S9piolZmHgV1z Iz4oBv9NrfN3OBrLP8Fyn45oRIiBiCYbm4PtS/coVMmDFoY5xRtrnMKENymMPcIBHOp0 NHyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gA5uj+lX; 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 t22-20020a0cb396000000b0067a56b2ec60si9302978qve.168.2023.12.19.11.17.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Dec 2023 11:17:57 -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=gA5uj+lX; 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 1rFfXC-00023h-3X; Tue, 19 Dec 2023 14:13:42 -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-0001yS-NB for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:33 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFfWw-0001ro-8z for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:29 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40c39e936b4so56217315e9.1 for ; Tue, 19 Dec 2023 11:13:25 -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=u7RSwDz13+9sv6W+3QlIzSQPKzKTiI3ycp67owFhcNM=; b=gA5uj+lX9sLkqTI3YNNrGi64fk2YQ/9jDP1QBYootLkNsStg1ikhUilbkFOXE+Qqwe ZUOsSb+aqAPT1R0sFP1QWmNJBlD4lqTOovM3uQLjyhRjqmbYDyvpd5uscsj+wQ6anj32 pPh0xfVbWFBNp+HcIN74sG7arMcXULuMVfgFh1nBs0bHSYlV6rEzzjvcxTqXysUNccGv 4VmE7VLfhEjQbvvWnXJmphuDN1BaV0edrkKXspYOMRvro8XWuBsjVyV8hMqCSduCA5g5 /7ekFOS2MjvDEWDifewRTUboLvVyIY6vaGWrrzsfdCtQsGf5NTGMXRFYAql2uiG/nwiK jdVA== 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=u7RSwDz13+9sv6W+3QlIzSQPKzKTiI3ycp67owFhcNM=; b=r/5YU8xB+VNCTzKjGY+wSPQ12zEkFZD2BI4tV/1fmiOUfX8e38OAcHjUV0eMezvBCZ 1kKoBlczzgkTefboCVFexNM9+tdNSw7Rqed+9xJlCyCkK7bsT7h0T4FFdrkEH8jPaUn+ cWjC03qDsHfQAEASNLAUECV6tiHwNhe0i/xN9pW+1eavCCTB59tbJukRkZC8iP+6ZbNl JV/dnA54j4HY6HtzJiQhI6HYVdwrNfl5LuMNDJbck1ropnMBGCjMcye8pnaCB1CDiwR8 v0IEBIz5eL8U9/laiz6izOiMMZNTNFEHbR3vJxLEwkj3+qt3NVyfGhhymcC904jNG/jO aHyQ== X-Gm-Message-State: AOJu0YwQ8c/jl/ZYsToCNtC7xQN+8F/aKv4Qga81PNi8CtoWYw8f7Q4A dA76/MKbXPMByLRG360fa18I4vxPGDTY9ffCnt0= X-Received: by 2002:a05:600c:16c4:b0:40c:3133:6f02 with SMTP id l4-20020a05600c16c400b0040c31336f02mr5045282wmn.342.1703013204803; Tue, 19 Dec 2023 11:13:24 -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.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 11:13:23 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 32/43] target/arm/kvm: Have kvm_arm_vcpu_finalize take a ARMCPU argument Date: Tue, 19 Dec 2023 19:12:56 +0000 Message-Id: <20231219191307.2895919-33-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::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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-12-philmd@linaro.org Signed-off-by: Peter Maydell --- target/arm/kvm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 9540d3cb618..a2370bc5747 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -82,7 +82,7 @@ static int kvm_arm_vcpu_init(ARMCPU *cpu) /** * kvm_arm_vcpu_finalize: - * @cs: CPUState + * @cpu: ARMCPU * @feature: feature to finalize * * Finalizes the configuration of the specified VCPU feature by @@ -92,9 +92,9 @@ static int kvm_arm_vcpu_init(ARMCPU *cpu) * * Returns: 0 if success else < 0 error code */ -static int kvm_arm_vcpu_finalize(CPUState *cs, int feature) +static int kvm_arm_vcpu_finalize(ARMCPU *cpu, int feature) { - return kvm_vcpu_ioctl(cs, KVM_ARM_VCPU_FINALIZE, &feature); + return kvm_vcpu_ioctl(CPU(cpu), KVM_ARM_VCPU_FINALIZE, &feature); } bool kvm_arm_create_scratch_host_vcpu(const uint32_t *cpus_to_try, @@ -1921,7 +1921,7 @@ int kvm_arch_init_vcpu(CPUState *cs) if (ret) { return ret; } - ret = kvm_arm_vcpu_finalize(cs, KVM_ARM_VCPU_SVE); + ret = kvm_arm_vcpu_finalize(cpu, KVM_ARM_VCPU_SVE); if (ret) { return ret; }