Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31928aa5 authored by Dominik Dingel's avatar Dominik Dingel Committed by Christian Borntraeger
Browse files

KVM: remove unneeded return value of vcpu_postcreate 



The return value of kvm_arch_vcpu_postcreate is not checked in its
caller.  This is okay, because only x86 provides vcpu_postcreate right
now and it could only fail if vcpu_load failed.  But that is not
possible during KVM_CREATE_VCPU (kvm_arch_vcpu_load is void, too), so
just get rid of the unchecked return value.

Signed-off-by: default avatarDominik Dingel <dingel@linux.vnet.ibm.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent bab5bb39

arch/arm/kvm/arm.c

+1 −2
Original line number Diff line number Diff line
@@ -241,9 +241,8 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 
	return ERR_PTR(err);

}



int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

{

	return 0;

}



void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)

arch/mips/kvm/mips.c

+1 −2
Original line number Diff line number Diff line
@@ -832,9 +832,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 
	return -ENOIOCTLCMD;

}



int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

{

	return 0;

}



int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

arch/powerpc/kvm/powerpc.c

+1 −2
Original line number Diff line number Diff line
@@ -623,9 +623,8 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 
	return vcpu;

}



int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

{

	return 0;

}



void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)

arch/s390/kvm/kvm-s390.c

+1 −2
Original line number Diff line number Diff line
@@ -615,9 +615,8 @@ static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu) 
	kvm_s390_clear_local_irqs(vcpu);

}



int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

{

	return 0;

}



static void kvm_s390_vcpu_crypto_setup(struct kvm_vcpu *vcpu)

arch/x86/kvm/x86.c

+3 −7
Original line number Diff line number Diff line
@@ -7056,15 +7056,13 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 
	return r;

}



int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

{

	int r;

	struct msr_data msr;

	struct kvm *kvm = vcpu->kvm;



	r = vcpu_load(vcpu);

	if (r)

		return r;

	if (vcpu_load(vcpu))

		return;

	msr.data = 0x0;

	msr.index = MSR_IA32_TSC;

	msr.host_initiated = true;
@@ -7073,8 +7071,6 @@ int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) 


	schedule_delayed_work(&kvm->arch.kvmclock_sync_work,

					KVMCLOCK_SYNC_PERIOD);



	return r;

}



void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)