Commit 3d4b2a4c authored by Oliver Upton's avatar Oliver Upton
Browse files

KVM: arm64: Remove unused return value from kvm_reset_vcpu() 

Get rid of the return value for kvm_reset_vcpu() as there are no longer
any cases where it returns a nonzero value.

Link: https://lore.kernel.org/r/20230920195036.1169791-8-oliver.upton@linux.dev


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent d99fb82f

arch/arm64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ extern unsigned int __ro_after_init kvm_sve_max_vl; 
int __init kvm_arm_init_sve(void);



u32 __attribute_const__ kvm_target_cpu(void);

int kvm_reset_vcpu(struct kvm_vcpu *vcpu);

void kvm_reset_vcpu(struct kvm_vcpu *vcpu);

void kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu);



struct kvm_hyp_memcache {

arch/arm64/kvm/arch_timer.c

+1 −3
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ void kvm_timer_sync_user(struct kvm_vcpu *vcpu) 
		unmask_vtimer_irq_user(vcpu);

}



int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu)

void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu)

{

	struct arch_timer_cpu *timer = vcpu_timer(vcpu);

	struct timer_map map;
@@ -987,8 +987,6 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu) 
		soft_timer_cancel(&map.emul_vtimer->hrtimer);

	if (map.emul_ptimer)

		soft_timer_cancel(&map.emul_ptimer->hrtimer);



	return 0;

}



static void timer_context_init(struct kvm_vcpu *vcpu, int timerid)

arch/arm64/kvm/arm.c

+4 −6
Original line number Diff line number Diff line
@@ -1282,15 +1282,12 @@ static int __kvm_vcpu_set_target(struct kvm_vcpu *vcpu, 
	bitmap_copy(vcpu->arch.features, &features, KVM_VCPU_MAX_FEATURES);



	/* Now we know what it is, we can reset it. */

	ret = kvm_reset_vcpu(vcpu);

	if (ret) {

		bitmap_zero(vcpu->arch.features, KVM_VCPU_MAX_FEATURES);

		goto out_unlock;

	}

	kvm_reset_vcpu(vcpu);



	bitmap_copy(kvm->arch.vcpu_features, &features, KVM_VCPU_MAX_FEATURES);

	set_bit(KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED, &kvm->arch.flags);

	vcpu_set_flag(vcpu, VCPU_INITIALIZED);

	ret = 0;

out_unlock:

	mutex_unlock(&kvm->arch.config_lock);

	return ret;
@@ -1315,7 +1312,8 @@ static int kvm_vcpu_set_target(struct kvm_vcpu *vcpu, 
	if (kvm_vcpu_init_changed(vcpu, init))

		return -EINVAL;



	return kvm_reset_vcpu(vcpu);

	kvm_reset_vcpu(vcpu);

	return 0;

}



static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu,

arch/arm64/kvm/reset.c

+2 −4
Original line number Diff line number Diff line
@@ -188,10 +188,9 @@ static void kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu) 
 * disable preemption around the vcpu reset as we would otherwise race with

 * preempt notifiers which also call put/load.

 */

int kvm_reset_vcpu(struct kvm_vcpu *vcpu)

void kvm_reset_vcpu(struct kvm_vcpu *vcpu)

{

	struct vcpu_reset_state reset_state;

	int ret;

	bool loaded;

	u32 pstate;
@@ -260,12 +259,11 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) 
	}



	/* Reset timer */

	ret = kvm_timer_vcpu_reset(vcpu);

	kvm_timer_vcpu_reset(vcpu);



	if (loaded)

		kvm_arch_vcpu_load(vcpu, smp_processor_id());

	preempt_enable();

	return ret;

}



u32 get_kvm_ipa_limit(void)

include/kvm/arm_arch_timer.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct arch_timer_cpu { 


int __init kvm_timer_hyp_init(bool has_gic);

int kvm_timer_enable(struct kvm_vcpu *vcpu);

int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu);

void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu);

void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu);

void kvm_timer_sync_user(struct kvm_vcpu *vcpu);

bool kvm_timer_should_notify_user(struct kvm_vcpu *vcpu);