Re: [PATCH-for-9.0 12/16] target/arm/kvm: Have kvm_arm_[get|put]_virtual_time take ARMCPU argument

[Gavin Shan]

On 11/24/23 05:35, Philippe Mathieu-Daudé wrote:

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é 
---
  target/arm/kvm.c | 23 ++-
  1 file changed, 10 insertions(+), 13 deletions(-)



Reviewed-by: Gavin Shan 

[PATCH-for-9.0 12/16] target/arm/kvm: Have kvm_arm_[get|put]_virtual_time take ARMCPU argument

[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é 
---
 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 dba2c9c6a9..57615ef4d1 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -1036,20 +1036,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();
@@ -1060,20 +1059,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();
@@ -1291,16 +1289,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);
 }
 }
 }
@@ -1881,7 +1878,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));
-- 
2.41.0