Commit 74ce2e60 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: PPC: Move all vcpu init code into kvm_arch_vcpu_create() 



Fold init() into create() now that the two are called back-to-back by
common KVM code (kvm_vcpu_init() calls kvm_arch_vcpu_init() as its last
action, and kvm_vm_ioctl_create_vcpu() calls kvm_arch_vcpu_create()
immediately thereafter).  Rinse and repeat for kvm_arch_vcpu_uninit()
and kvm_arch_vcpu_destroy().  This paves the way for removing
kvm_arch_vcpu_{un}init() entirely.

Note, calling kvmppc_mmu_destroy() if kvmppc_core_vcpu_create() fails
may or may not be necessary.  Move it along with the more obvious call
to kvmppc_subarch_vcpu_uninit() so as not to inadvertantly introduce a
functional change and/or bug.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 39a93a87

arch/powerpc/kvm/powerpc.c

+32 −24
Original line number Diff line number Diff line
@@ -725,17 +725,43 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id) 
	return 0;

}



static enum hrtimer_restart kvmppc_decrementer_wakeup(struct hrtimer *timer)

{

	struct kvm_vcpu *vcpu;



	vcpu = container_of(timer, struct kvm_vcpu, arch.dec_timer);

	kvmppc_decrementer_func(vcpu);



	return HRTIMER_NORESTART;

}



int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)

{

	int err;



	err = kvmppc_core_vcpu_create(vcpu);

	hrtimer_init(&vcpu->arch.dec_timer, CLOCK_REALTIME, HRTIMER_MODE_ABS);

	vcpu->arch.dec_timer.function = kvmppc_decrementer_wakeup;

	vcpu->arch.dec_expires = get_tb();



#ifdef CONFIG_KVM_EXIT_TIMING

	mutex_init(&vcpu->arch.exit_timing_lock);

#endif

	err = kvmppc_subarch_vcpu_init(vcpu);

	if (err)

		return err;



	err = kvmppc_core_vcpu_create(vcpu);

	if (err)

		goto out_vcpu_uninit;



	vcpu->arch.wqp = &vcpu->wq;

	kvmppc_create_vcpu_debugfs(vcpu, vcpu->vcpu_id);

	return 0;



out_vcpu_uninit:

	kvmppc_mmu_destroy(vcpu);

	kvmppc_subarch_vcpu_uninit(vcpu);

	return err;

}



void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
@@ -765,6 +791,9 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) 
	}



	kvmppc_core_vcpu_free(vcpu);



	kvmppc_mmu_destroy(vcpu);

	kvmppc_subarch_vcpu_uninit(vcpu);

}



int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)
@@ -772,35 +801,14 @@ int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) 
	return kvmppc_core_pending_dec(vcpu);

}



static enum hrtimer_restart kvmppc_decrementer_wakeup(struct hrtimer *timer)

{

	struct kvm_vcpu *vcpu;



	vcpu = container_of(timer, struct kvm_vcpu, arch.dec_timer);

	kvmppc_decrementer_func(vcpu);



	return HRTIMER_NORESTART;

}



int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)

{

	int ret;



	hrtimer_init(&vcpu->arch.dec_timer, CLOCK_REALTIME, HRTIMER_MODE_ABS);

	vcpu->arch.dec_timer.function = kvmppc_decrementer_wakeup;

	vcpu->arch.dec_expires = get_tb();



#ifdef CONFIG_KVM_EXIT_TIMING

	mutex_init(&vcpu->arch.exit_timing_lock);

#endif

	ret = kvmppc_subarch_vcpu_init(vcpu);

	return ret;

	return 0;

}



void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)

{

	kvmppc_mmu_destroy(vcpu);

	kvmppc_subarch_vcpu_uninit(vcpu);



}



void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)