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

Commit a2b07739 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Radim Krčmář
Browse files

kvm: x86: merge kvm_arch_set_irq and kvm_arch_set_irq_inatomic 



kvm_arch_set_irq is unused since commit b97e6de9.  Merge
its functionality with kvm_arch_set_irq_inatomic.

Reported-by: default avatarJiang Biao <jiang.biao2@zte.com.cn>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 7301d6ab

arch/x86/kvm/irq_comm.c

+27 −31
Original line number Diff line number Diff line
@@ -156,6 +156,16 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, 
}





static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e,

		    struct kvm *kvm, int irq_source_id, int level,

		    bool line_status)

{

	if (!level)

		return -1;



	return kvm_hv_synic_set_irq(kvm, e->hv_sint.vcpu, e->hv_sint.sint);

}



int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e,

			      struct kvm *kvm, int irq_source_id, int level,

			      bool line_status)
@@ -163,9 +173,12 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, 
	struct kvm_lapic_irq irq;

	int r;



	if (unlikely(e->type != KVM_IRQ_ROUTING_MSI))

		return -EWOULDBLOCK;

	switch (e->type) {

	case KVM_IRQ_ROUTING_HV_SINT:

		return kvm_hv_set_sint(e, kvm, irq_source_id, level,

				       line_status);



	case KVM_IRQ_ROUTING_MSI:

		if (kvm_msi_route_invalid(kvm, e))

			return -EINVAL;
@@ -173,7 +186,12 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, 


		if (kvm_irq_delivery_to_apic_fast(kvm, NULL, &irq, &r, NULL))

			return r;

	else

		break;



	default:

		break;

	}



	return -EWOULDBLOCK;

}
@@ -254,16 +272,6 @@ void kvm_fire_mask_notifiers(struct kvm *kvm, unsigned irqchip, unsigned pin, 
	srcu_read_unlock(&kvm->irq_srcu, idx);

}



static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e,

		    struct kvm *kvm, int irq_source_id, int level,

		    bool line_status)

{

	if (!level)

		return -1;



	return kvm_hv_synic_set_irq(kvm, e->hv_sint.vcpu, e->hv_sint.sint);

}



int kvm_set_routing_entry(struct kvm *kvm,

			  struct kvm_kernel_irq_routing_entry *e,

			  const struct kvm_irq_routing_entry *ue)
@@ -423,18 +431,6 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu, 
	srcu_read_unlock(&kvm->irq_srcu, idx);

}



int kvm_arch_set_irq(struct kvm_kernel_irq_routing_entry *irq, struct kvm *kvm,

		     int irq_source_id, int level, bool line_status)

{

	switch (irq->type) {

	case KVM_IRQ_ROUTING_HV_SINT:

		return kvm_hv_set_sint(irq, kvm, irq_source_id, level,

				       line_status);

	default:

		return -EWOULDBLOCK;

	}

}



void kvm_arch_irq_routing_update(struct kvm *kvm)

{

	kvm_hv_irq_routing_update(kvm);