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

Commit a1b37100 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: Reduce runnability interface with arch support code 



Remove kvm_cpu_has_interrupt() and kvm_arch_interrupt_allowed() from
interface between general code and arch code. kvm_arch_vcpu_runnable()
checks for interrupts instead.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 0b71785d

arch/ia64/kvm/kvm-ia64.c

+2 −14
Original line number Diff line number Diff line
@@ -1935,19 +1935,6 @@ int kvm_highest_pending_irq(struct kvm_vcpu *vcpu) 
    return find_highest_bits((int *)&vpd->irr[0]);

}



int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu)

{

	if (kvm_highest_pending_irq(vcpu) != -1)

		return 1;

	return 0;

}



int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu)

{

	/* do real check here */

	return 1;

}



int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.timer_fired;
@@ -1960,7 +1947,8 @@ gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn) 


int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE;

	return (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE) ||

		(kvm_highest_pending_irq(vcpu) != -1);

}



int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,

arch/powerpc/kvm/powerpc.c

+1 −12
Original line number Diff line number Diff line
@@ -39,20 +39,9 @@ gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn) 
	return gfn;

}



int kvm_cpu_has_interrupt(struct kvm_vcpu *v)

{

	return !!(v->arch.pending_exceptions);

}



int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu)

{

	/* do real check here */

	return 1;

}



int kvm_arch_vcpu_runnable(struct kvm_vcpu *v)

{

	return !(v->arch.msr & MSR_WE);

	return !(v->arch.msr & MSR_WE) || !!(v->arch.pending_exceptions);

}

arch/s390/kvm/interrupt.c

+1 −7
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int __try_deliver_ckc_interrupt(struct kvm_vcpu *vcpu) 
	return 1;

}



int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu)

static int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu)

{

	struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;

	struct kvm_s390_float_interrupt *fi = vcpu->arch.local_int.float_int;
@@ -320,12 +320,6 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu) 
	return rc;

}



int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu)

{

	/* do real check here */

	return 1;

}



int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)

{

	return 0;

arch/x86/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -797,6 +797,8 @@ asmlinkage void kvm_handle_fault_on_reboot(void); 
int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);

int kvm_age_hva(struct kvm *kvm, unsigned long hva);

int cpuid_maxphyaddr(struct kvm_vcpu *vcpu);

int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu);

int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu);

int kvm_cpu_get_interrupt(struct kvm_vcpu *v);



#endif /* _ASM_X86_KVM_HOST_H */

arch/x86/kvm/x86.c

+4 −2
Original line number Diff line number Diff line
@@ -4891,7 +4891,9 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) 
{

	return vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE

		|| vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED

	       || vcpu->arch.nmi_pending;

		|| vcpu->arch.nmi_pending ||

		(kvm_arch_interrupt_allowed(vcpu) &&

		 kvm_cpu_has_interrupt(vcpu));

}



void kvm_vcpu_kick(struct kvm_vcpu *vcpu)