Commit 4a643be8 authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Avi Kivity
Browse files

KVM: split out kvm_free_assigned_irq() 



Split out the logic corresponding to undoing assign_irq() and
clean it up a bit.

Signed-off-by: default avatarMark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 61552367

virt/kvm/kvm_main.c

+22 −7
Original line number Diff line number Diff line
@@ -200,14 +200,11 @@ static void kvm_assigned_dev_ack_irq(struct kvm_irq_ack_notifier *kian) 
	enable_irq(dev->host_irq);

}



static void kvm_free_assigned_device(struct kvm *kvm,

				     struct kvm_assigned_dev_kernel

				     *assigned_dev)

static void kvm_free_assigned_irq(struct kvm *kvm,

				  struct kvm_assigned_dev_kernel *assigned_dev)

{

	if (irqchip_in_kernel(kvm) && assigned_dev->irq_requested_type)

		free_irq(assigned_dev->host_irq, (void *)assigned_dev);

	if (assigned_dev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI)

		pci_disable_msi(assigned_dev->dev);

	if (!irqchip_in_kernel(kvm))

		return;



	kvm_unregister_irq_ack_notifier(&assigned_dev->ack_notifier);
@@ -215,12 +212,30 @@ static void kvm_free_assigned_device(struct kvm *kvm, 
		kvm_free_irq_source_id(kvm, assigned_dev->irq_source_id);

	assigned_dev->irq_source_id = -1;



	if (!assigned_dev->irq_requested_type)

		return;



	if (cancel_work_sync(&assigned_dev->interrupt_work))

		/* We had pending work. That means we will have to take

		 * care of kvm_put_kvm.

		 */

		kvm_put_kvm(kvm);



	free_irq(assigned_dev->host_irq, (void *)assigned_dev);



	if (assigned_dev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI)

		pci_disable_msi(assigned_dev->dev);



	assigned_dev->irq_requested_type = 0;

}





static void kvm_free_assigned_device(struct kvm *kvm,

				     struct kvm_assigned_dev_kernel

				     *assigned_dev)

{

	kvm_free_assigned_irq(kvm, assigned_dev);



	pci_reset_function(assigned_dev->dev);



	pci_release_regions(assigned_dev->dev);