target/arm/kvm: Have kvm_arm_add_vcpu_properties take a ARMCPU argument

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-4-philmd@linaro.org
[PMM: fix parameter name in doc comment too]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-12-19 17:57:44 +00:00 committed by Peter Maydell
parent 600f070e93
commit cac675b54e
3 changed files with 6 additions and 6 deletions

View file

@ -1686,7 +1686,7 @@ void arm_cpu_post_init(Object *obj)
} }
if (kvm_enabled()) { if (kvm_enabled()) {
kvm_arm_add_vcpu_properties(obj); kvm_arm_add_vcpu_properties(cpu);
} }
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY

View file

@ -497,10 +497,10 @@ static void kvm_steal_time_set(Object *obj, bool value, Error **errp)
} }
/* KVM VCPU properties should be prefixed with "kvm-". */ /* KVM VCPU properties should be prefixed with "kvm-". */
void kvm_arm_add_vcpu_properties(Object *obj) void kvm_arm_add_vcpu_properties(ARMCPU *cpu)
{ {
ARMCPU *cpu = ARM_CPU(obj);
CPUARMState *env = &cpu->env; CPUARMState *env = &cpu->env;
Object *obj = OBJECT(cpu);
if (arm_feature(env, ARM_FEATURE_GENERIC_TIMER)) { if (arm_feature(env, ARM_FEATURE_GENERIC_TIMER)) {
cpu->kvm_adjvtime = true; cpu->kvm_adjvtime = true;

View file

@ -148,12 +148,12 @@ void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu);
/** /**
* kvm_arm_add_vcpu_properties: * kvm_arm_add_vcpu_properties:
* @obj: The CPU object to add the properties to * @cpu: The CPU object to add the properties to
* *
* Add all KVM specific CPU properties to the CPU object. These * Add all KVM specific CPU properties to the CPU object. These
* are the CPU properties with "kvm-" prefixed names. * are the CPU properties with "kvm-" prefixed names.
*/ */
void kvm_arm_add_vcpu_properties(Object *obj); void kvm_arm_add_vcpu_properties(ARMCPU *cpu);
/** /**
* kvm_arm_steal_time_finalize: * kvm_arm_steal_time_finalize:
@ -243,7 +243,7 @@ static inline void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu)
g_assert_not_reached(); g_assert_not_reached();
} }
static inline void kvm_arm_add_vcpu_properties(Object *obj) static inline void kvm_arm_add_vcpu_properties(ARMCPU *cpu)
{ {
g_assert_not_reached(); g_assert_not_reached();
} }