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

Commit 5736199a authored by Zhang Xiantao's avatar Zhang Xiantao Committed by Avi Kivity
Browse files

KVM: Move kvm_vcpu_kick() to x86.c 



Moving kvm_vcpu_kick() to x86.c. Since it should be
common for all archs, put its declarations in <linux/kvm_host.h>

Signed-off-by: default avatarZhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 0eb8f498

arch/x86/kvm/irq.c

+0 −20
Original line number Diff line number Diff line
@@ -63,26 +63,6 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v) 
}

EXPORT_SYMBOL_GPL(kvm_cpu_get_interrupt);



static void vcpu_kick_intr(void *info)

{

#ifdef DEBUG

	struct kvm_vcpu *vcpu = (struct kvm_vcpu *)info;

	printk(KERN_DEBUG "vcpu_kick_intr %p \n", vcpu);

#endif

}



void kvm_vcpu_kick(struct kvm_vcpu *vcpu)

{

	int ipi_pcpu = vcpu->cpu;



	if (waitqueue_active(&vcpu->wq)) {

		wake_up_interruptible(&vcpu->wq);

		++vcpu->stat.halt_wakeup;

	}

	if (vcpu->guest_mode)

		smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0, 0);

}



void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu)

{

	kvm_inject_apic_timer_irqs(vcpu);

arch/x86/kvm/irq.h

+0 −2
Original line number Diff line number Diff line
@@ -85,6 +85,4 @@ void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu); 
void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu);

void kvm_migrate_apic_timer(struct kvm_vcpu *vcpu);



void kvm_vcpu_kick(struct kvm_vcpu *vcpu);



#endif

arch/x86/kvm/x86.c

+20 −0
Original line number Diff line number Diff line
@@ -3144,3 +3144,23 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) 
	return vcpu->arch.mp_state == VCPU_MP_STATE_RUNNABLE

	       || vcpu->arch.mp_state == VCPU_MP_STATE_SIPI_RECEIVED;

}



static void vcpu_kick_intr(void *info)

{

#ifdef DEBUG

	struct kvm_vcpu *vcpu = (struct kvm_vcpu *)info;

	printk(KERN_DEBUG "vcpu_kick_intr %p \n", vcpu);

#endif

}



void kvm_vcpu_kick(struct kvm_vcpu *vcpu)

{

	int ipi_pcpu = vcpu->cpu;



	if (waitqueue_active(&vcpu->wq)) {

		wake_up_interruptible(&vcpu->wq);

		++vcpu->stat.halt_wakeup;

	}

	if (vcpu->guest_mode)

		smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0, 0);

}

include/linux/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm); 


int kvm_cpu_get_interrupt(struct kvm_vcpu *v);

int kvm_cpu_has_interrupt(struct kvm_vcpu *v);

void kvm_vcpu_kick(struct kvm_vcpu *vcpu);



static inline void kvm_guest_enter(void)

{