From patchwork Wed Aug 2 23:42:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 13338945 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C4C5C001DE for ; Wed, 2 Aug 2023 23:43:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232808AbjHBXn2 (ORCPT ); Wed, 2 Aug 2023 19:43:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232163AbjHBXnY (ORCPT ); Wed, 2 Aug 2023 19:43:24 -0400 Received: from out-123.mta1.migadu.com (out-123.mta1.migadu.com [IPv6:2001:41d0:203:375::7b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 844F730D8 for ; Wed, 2 Aug 2023 16:43:21 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1691019799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q6y1KaRBCfEhAMm1HIfWLDZ8Yvuk3D4O0G72vSLm3y4=; b=p6xIMzpUjpUCNKvdhM46H+Li4gbYlyh3t5vRdx1s8VodHhtcmK3+odUs3GJS+wWAO7yZU8 C1PjDCDvTGYVQINXR6nKrhMbna8QWX3KkI/Kc4kKvMHu+lkTgxZCw8lm09c1V+oeEeWFJH PtFfHsOG1wnzFmTdl4kN3azVdyg2IoM= From: Oliver Upton To: kvmarm@lists.linux.dev Cc: kvm@vger.kernel.org, Marc Zyngier , James Morse , Suzuki K Poulose , Zenghui Yu , Will Deacon , Julien Thierry , Salil Mehta , Oliver Upton Subject: [PATCH kvmtool v3 04/17] arm: Stash kvm_vcpu_init for later use Date: Wed, 2 Aug 2023 23:42:42 +0000 Message-ID: <20230802234255.466782-5-oliver.upton@linux.dev> In-Reply-To: <20230802234255.466782-1-oliver.upton@linux.dev> References: <20230802234255.466782-1-oliver.upton@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org A subsequent change will add support for resetting a vCPU, which requires reissuing the KVM_ARM_VCPU_INIT ioctl. Save the kvm_vcpu_init worked out for later use. Signed-off-by: Oliver Upton --- arm/include/arm-common/kvm-cpu-arch.h | 2 +- arm/kvm-cpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arm/include/arm-common/kvm-cpu-arch.h b/arm/include/arm-common/kvm-cpu-arch.h index 923d2c4c7ad3..bf5223eaa851 100644 --- a/arm/include/arm-common/kvm-cpu-arch.h +++ b/arm/include/arm-common/kvm-cpu-arch.h @@ -11,7 +11,7 @@ struct kvm_cpu { pthread_t thread; unsigned long cpu_id; - unsigned long cpu_type; + struct kvm_vcpu_init init; const char *cpu_compatible; struct kvm *kvm; diff --git a/arm/kvm-cpu.c b/arm/kvm-cpu.c index a43eb90a7642..0769eef198ac 100644 --- a/arm/kvm-cpu.c +++ b/arm/kvm-cpu.c @@ -114,7 +114,7 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id) /* Populate the vcpu structure. */ vcpu->kvm = kvm; vcpu->cpu_id = cpu_id; - vcpu->cpu_type = vcpu_init.target; + vcpu->init = vcpu_init; vcpu->cpu_compatible = target->compatible; vcpu->is_running = true;