redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

KVM: split out kvm_free_assigned_irq()

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

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Mark McLoughlin 2008-12-01 13:57:49 +00:00 committed by Avi Kivity
parent 61552367b2
commit 4a643be8c9
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
virt/kvm/kvm_main.c
View file

@ -200,14 +200,11 @@ static void kvm_assigned_dev_ack_irq(struct kvm_irq_ack_notifier *kian)
enable_irq(dev->host_irq); enable_irq(dev->host_irq);
} }
static void kvm_free_assigned_device(struct kvm *kvm, static void kvm_free_assigned_irq(struct kvm *kvm,
struct kvm_assigned_dev_kernel struct kvm_assigned_dev_kernel *assigned_dev)
*assigned_dev)
{ {
if (irqchip_in_kernel(kvm) && assigned_dev->irq_requested_type) if (!irqchip_in_kernel(kvm))
free_irq(assigned_dev->host_irq, (void *)assigned_dev); return;
if (assigned_dev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI)
pci_disable_msi(assigned_dev->dev);
kvm_unregister_irq_ack_notifier(&assigned_dev->ack_notifier); 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); kvm_free_irq_source_id(kvm, assigned_dev->irq_source_id);
assigned_dev->irq_source_id = -1; assigned_dev->irq_source_id = -1;
if (!assigned_dev->irq_requested_type)
return;
if (cancel_work_sync(&assigned_dev->interrupt_work)) if (cancel_work_sync(&assigned_dev->interrupt_work))
/* We had pending work. That means we will have to take /* We had pending work. That means we will have to take
* care of kvm_put_kvm. * care of kvm_put_kvm.
*/ */
kvm_put_kvm(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_reset_function(assigned_dev->dev);
pci_release_regions(assigned_dev->dev); pci_release_regions(assigned_dev->dev);