Commit 8b6e4547 authored by Jan Kiszka's avatar Jan Kiszka Committed by Marcelo Tosatti
Browse files

KVM: x86: Convert kvm_arch_vcpu_reset into private kvm_vcpu_reset 



There are no external callers of this function as there is no concept of
resetting a vcpu from generic code.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent ecefbd94

arch/x86/kvm/x86.c

+5 −3
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ u64 __read_mostly host_xcr0; 


int emulator_fix_hypercall(struct x86_emulate_ctxt *ctxt);



static int kvm_vcpu_reset(struct kvm_vcpu *vcpu);



static inline void kvm_async_pf_hash_reset(struct kvm_vcpu *vcpu)

{

	int i;
@@ -5426,7 +5428,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) 
		pr_debug("vcpu %d received sipi with vector # %x\n",

			 vcpu->vcpu_id, vcpu->arch.sipi_vector);

		kvm_lapic_reset(vcpu);

		r = kvm_arch_vcpu_reset(vcpu);

		r = kvm_vcpu_reset(vcpu);

		if (r)

			return r;

		vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
@@ -6036,7 +6038,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 
	r = vcpu_load(vcpu);

	if (r)

		return r;

	r = kvm_arch_vcpu_reset(vcpu);

	r = kvm_vcpu_reset(vcpu);

	if (r == 0)

		r = kvm_mmu_setup(vcpu);

	vcpu_put(vcpu);
@@ -6058,7 +6060,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) 
	kvm_x86_ops->vcpu_free(vcpu);

}



int kvm_arch_vcpu_reset(struct kvm_vcpu *vcpu)

static int kvm_vcpu_reset(struct kvm_vcpu *vcpu)

{

	atomic_set(&vcpu->arch.nmi_queued, 0);

	vcpu->arch.nmi_pending = 0;

include/linux/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -582,7 +582,6 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id); 
int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu);

void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu);



int kvm_arch_vcpu_reset(struct kvm_vcpu *vcpu);

int kvm_arch_hardware_enable(void *garbage);

void kvm_arch_hardware_disable(void *garbage);

int kvm_arch_hardware_setup(void);