riscv-v: kvm: Make kvm_riscv_guest_timer_init a void function
Subsystems (2)
PATCH 1/1 riscv-v: kvm: Make kvm_riscv_guest_timer_init a void function
It can never fail so convey that fact explicitly by making the function void. Also in kvm_arch_init_vm it makes it clear that there no need to do any cleanup after kvm_riscv_gstage_vmid_init has been called.
Signed-off-by Nikolay Borisov <[email protected]>
--- arch/riscv/include/asm/kvm_vcpu_timer.h | 2 +- arch/riscv/kvm/vcpu_timer.c | 4 +--- arch/riscv/kvm/vm.c | 4 +++- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/riscv/include/asm/kvm_vcpu_timer.h +1 -1
@@ -39,6 +39,6 @@ int kvm_riscv_vcpu_timer_init(struct kvm_vcpu *vcpu);int kvm_riscv_vcpu_timer_deinit (struct kvm_vcpu *vcpu);int kvm_riscv_vcpu_timer_reset (struct kvm_vcpu *vcpu);void kvm_riscv_vcpu_timer_restore (struct kvm_vcpu *vcpu); -int kvm_riscv_guest_timer_init (struct kvm *kvm); +void kvm_riscv_guest_timer_init (struct kvm *kvm);#endif
arch/riscv/kvm/vcpu_timer.c +1 -3
@@ -214,12 +214,10 @@ void kvm_riscv_vcpu_timer_restore(struct kvm_vcpu *vcpu)#endif } -int kvm_riscv_guest_timer_init (struct kvm *kvm) +void kvm_riscv_guest_timer_init (struct kvm *kvm) {struct kvm_guest_timer *gt = &kvm->arch.timer;riscv_cs_get_mult_shift (>->nsec_mult, >->nsec_shift); gt->time_delta = -get_cycles64 (); - -return 0 ; }
arch/riscv/kvm/vm.c +3 -1
@@ -41,7 +41,9 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)return r; } -return kvm_riscv_guest_timer_init (kvm); +kvm_riscv_guest_timer_init (kvm); + +return 0 ; }void kvm_arch_destroy_vm (struct kvm *kvm)
Signature · 1 line
2.25.1
Anup Patel
maintainerPATCH 1/1 riscv-v: kvm: Make kvm_riscv_guest_timer_init a void function
Quoted 6 lines · Nikolay Borisov
It can never fail so convey that fact explicitly by making the function void. Also in
kvm_arch_init_vmit makes it clear that there no need to do any cleanup afterkvm_riscv_gstage_vmid_inithas been called.Signed-off-by Nikolay Borisov <[email protected]>
Minor typo in patch subject. It should have prefix "riscv: kvm:".
I have taken care of above typo and queued it for 5.20
Thanks,
Anup
Quoted 54 lines
--- arch/riscv/include/asm/kvm_vcpu_timer.h | 2 +- arch/riscv/kvm/vcpu_timer.c | 4 +--- arch/riscv/kvm/vm.c | 4 +++- 3 files changed, 5 insertions(+), 5 deletions(-)arch/riscv/include/asm/kvm_vcpu_timer.h +1
-1@@ -39,6 +39,6 @@ int kvm_riscv_vcpu_timer_init(struct kvm_vcpu *vcpu);int kvm_riscv_vcpu_timer_deinit (struct kvm_vcpu *vcpu);int kvm_riscv_vcpu_timer_reset (struct kvm_vcpu *vcpu);void kvm_riscv_vcpu_timer_restore (struct kvm_vcpu *vcpu); -int kvm_riscv_guest_timer_init (struct kvm *kvm); +void kvm_riscv_guest_timer_init (struct kvm *kvm);#endif arch/riscv/kvm/vcpu_timer.c +1
-3@@ -214,12 +214,10 @@ void kvm_riscv_vcpu_timer_restore(struct kvm_vcpu *vcpu)#endif } -int kvm_riscv_guest_timer_init (struct kvm *kvm) +void kvm_riscv_guest_timer_init (struct kvm *kvm) {struct kvm_guest_timer *gt = &kvm->arch.timer;riscv_cs_get_mult_shift (>->nsec_mult, >->nsec_shift); gt->time_delta = -get_cycles64 (); - -return 0 ; }arch/riscv/kvm/vm.c +3
-2@@ -41,7 +41,9 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)return r; } -return kvm_riscv_guest_timer_init (kvm); +kvm_riscv_guest_timer_init (kvm); + +return 0 ; }void kvm_arch_destroy_vm (struct kvm *kvm) --2.25.1