Commit cca986fa authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Anup Patel
Browse files

RISC-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: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent 6259d2f8

arch/riscv/include/asm/kvm_vcpu_timer.h

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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(&gt->nsec_mult, &gt->nsec_shift);

	gt->time_delta = -get_cycles64();



	return 0;

}

arch/riscv/kvm/vm.c

+3 −1
Original line number Diff line number Diff line
@@ -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)