[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 31/43] target/arm/kvm: Have kvm_arm_vcpu_init take a ARMCPU argume
From: |
Peter Maydell |
Subject: |
[PULL 31/43] target/arm/kvm: Have kvm_arm_vcpu_init take a ARMCPU argument |
Date: |
Tue, 19 Dec 2023 19:12:55 +0000 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
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é <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-id: 20231123183518.64569-11-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/kvm.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 45ee491a56b..9540d3cb618 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -62,7 +62,7 @@ static ARMHostCPUFeatures arm_host_cpu_features;
/**
* kvm_arm_vcpu_init:
- * @cs: CPUState
+ * @cpu: ARMCPU
*
* Initialize (or reinitialize) the VCPU by invoking the
* KVM_ARM_VCPU_INIT ioctl with the CPU type and feature
@@ -70,15 +70,14 @@ static ARMHostCPUFeatures arm_host_cpu_features;
*
* Returns: 0 if success else < 0 error code
*/
-static int kvm_arm_vcpu_init(CPUState *cs)
+static int kvm_arm_vcpu_init(ARMCPU *cpu)
{
- ARMCPU *cpu = ARM_CPU(cs);
struct kvm_vcpu_init init;
init.target = cpu->kvm_target;
memcpy(init.features, cpu->kvm_init_features, sizeof(init.features));
- return kvm_vcpu_ioctl(cs, KVM_ARM_VCPU_INIT, &init);
+ return kvm_vcpu_ioctl(CPU(cpu), KVM_ARM_VCPU_INIT, &init);
}
/**
@@ -982,7 +981,7 @@ void kvm_arm_reset_vcpu(ARMCPU *cpu)
/* Re-init VCPU so that all registers are set to
* their respective reset values.
*/
- ret = kvm_arm_vcpu_init(CPU(cpu));
+ ret = kvm_arm_vcpu_init(cpu);
if (ret < 0) {
fprintf(stderr, "kvm_arm_vcpu_init failed: %s\n", strerror(-ret));
abort();
@@ -1912,7 +1911,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
}
/* Do KVM_ARM_VCPU_INIT ioctl */
- ret = kvm_arm_vcpu_init(cs);
+ ret = kvm_arm_vcpu_init(cpu);
if (ret) {
return ret;
}
--
2.34.1
- [PULL 18/43] target/arm/kvm: Init cap_has_inject_serror_esr in kvm_arch_init, (continued)
- [PULL 18/43] target/arm/kvm: Init cap_has_inject_serror_esr in kvm_arch_init, Peter Maydell, 2023/12/19
- [PULL 27/43] target/arm/kvm: Have kvm_arm_set_device_attr take a ARMCPU argument, Peter Maydell, 2023/12/19
- [PULL 16/43] target/arm/kvm: Unexport kvm_arm_vcpu_finalize, Peter Maydell, 2023/12/19
- [PULL 14/43] target/arm/kvm: Merge kvm64.c into kvm.c, Peter Maydell, 2023/12/19
- [PULL 24/43] target/arm/kvm: Have kvm_arm_add_vcpu_properties take a ARMCPU argument, Peter Maydell, 2023/12/19
- [PULL 33/43] target/arm/kvm: Have kvm_arm_[get|put]_virtual_time take ARMCPU argument, Peter Maydell, 2023/12/19
- [PULL 36/43] target/arm/kvm: Have kvm_arm_handle_debug take a ARMCPU argument, Peter Maydell, 2023/12/19
- [PULL 37/43] target/arm/kvm: Have kvm_arm_hw_debug_active take a ARMCPU argument, Peter Maydell, 2023/12/19
- [PULL 21/43] target/arm/kvm: Unexport kvm_arm_vm_state_change, Peter Maydell, 2023/12/19
- [PULL 28/43] target/arm/kvm: Have kvm_arm_pvtime_init take a ARMCPU argument, Peter Maydell, 2023/12/19
- [PULL 31/43] target/arm/kvm: Have kvm_arm_vcpu_init take a ARMCPU argument,
Peter Maydell <=
- [PULL 32/43] target/arm/kvm: Have kvm_arm_vcpu_finalize take a ARMCPU argument, Peter Maydell, 2023/12/19
- [PULL 34/43] target/arm/kvm: Have kvm_arm_verify_ext_dabt_pending take a ARMCPU arg, Peter Maydell, 2023/12/19
- [PULL 22/43] hw/intc/arm_gicv3: Include missing 'qemu/error-report.h' header, Peter Maydell, 2023/12/19
- [PULL 38/43] target/arm: Don't implement *32_EL2 registers when EL1 is AArch64 only, Peter Maydell, 2023/12/19
- [PULL 39/43] target/arm: Restrict TCG specific helpers, Peter Maydell, 2023/12/19
- [PULL 40/43] target/arm: Restrict DC CVAP & DC CVADP instructions to TCG accel, Peter Maydell, 2023/12/19
- [PULL 42/43] target/arm/helper: Propagate MDCR_EL2.HPMN into PMCR_EL0.N, Peter Maydell, 2023/12/19
- [PULL 26/43] target/arm/kvm: Have kvm_arm_sve_get_vls take a ARMCPU argument, Peter Maydell, 2023/12/19
- [PULL 30/43] target/arm/kvm: Have kvm_arm_pmu_set_irq take a ARMCPU argument, Peter Maydell, 2023/12/19
- [PULL 29/43] target/arm/kvm: Have kvm_arm_pmu_init take a ARMCPU argument, Peter Maydell, 2023/12/19