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

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

KVM: Remove inject_pending_vectors() callback 



It is the same as inject_pending_irq() for VMX/SVM now.

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

arch/x86/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -517,8 +517,6 @@ struct kvm_x86_ops { 
	void (*queue_exception)(struct kvm_vcpu *vcpu, unsigned nr,

				bool has_error_code, u32 error_code);

	void (*inject_pending_irq)(struct kvm_vcpu *vcpu, struct kvm_run *run);

	void (*inject_pending_vectors)(struct kvm_vcpu *vcpu,

				       struct kvm_run *run);

	int (*interrupt_allowed)(struct kvm_vcpu *vcpu);

	int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);

	int (*get_tdp_level)(void);

arch/x86/kvm/svm.c

+0 −1
Original line number Diff line number Diff line
@@ -2655,7 +2655,6 @@ static struct kvm_x86_ops svm_x86_ops = { 
	.set_irq = svm_set_irq,

	.queue_exception = svm_queue_exception,

	.inject_pending_irq = svm_intr_assist,

	.inject_pending_vectors = svm_intr_assist,

	.interrupt_allowed = svm_interrupt_allowed,



	.set_tss_addr = svm_set_tss_addr,

arch/x86/kvm/vmx.c

+0 −1
Original line number Diff line number Diff line
@@ -3693,7 +3693,6 @@ static struct kvm_x86_ops vmx_x86_ops = { 
	.set_irq = vmx_inject_irq,

	.queue_exception = vmx_queue_exception,

	.inject_pending_irq = vmx_intr_assist,

	.inject_pending_vectors = vmx_intr_assist,

	.interrupt_allowed = vmx_interrupt_allowed,

	.set_tss_addr = vmx_set_tss_addr,

	.get_tdp_level = get_ept_level,

arch/x86/kvm/x86.c

+1 −3
Original line number Diff line number Diff line
@@ -3171,10 +3171,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 


	if (vcpu->arch.exception.pending)

		__queue_exception(vcpu);

	else if (irqchip_in_kernel(vcpu->kvm))

		kvm_x86_ops->inject_pending_irq(vcpu, kvm_run);

	else

		kvm_x86_ops->inject_pending_vectors(vcpu, kvm_run);

		kvm_x86_ops->inject_pending_irq(vcpu, kvm_run);



	kvm_lapic_sync_to_vapic(vcpu);