leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: Refactor IRQ names of assigned devices

Browse Source 
Cosmetic change, but it helps to correlate IRQs with PCI devices.

Acked-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2010-11-16 22:30:04 +01:00 committed by Avi Kivity
parent 0645211c43
commit 1e001d49f9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/kvm_host.h
View File

@ -489,6 +489,7 @@ struct kvm_assigned_dev_kernel {
struct pci_dev *dev; struct pci_dev *dev;
struct kvm *kvm; struct kvm *kvm;
spinlock_t intx_lock; spinlock_t intx_lock;
char irq_name[32];
}; };
struct kvm_irq_mask_notifier { struct kvm_irq_mask_notifier {

11
virt/kvm/assigned-dev.c
View File

@ -231,8 +231,7 @@ static int assigned_device_enable_host_intx(struct kvm *kvm,
* are going to be long delays in accepting, acking, etc. * are going to be long delays in accepting, acking, etc.
*/ */
if (request_threaded_irq(dev->host_irq, NULL, kvm_assigned_dev_thread, if (request_threaded_irq(dev->host_irq, NULL, kvm_assigned_dev_thread,
IRQF_ONESHOT, "kvm_assigned_intx_device", IRQF_ONESHOT, dev->irq_name, (void *)dev))
(void *)dev))
return -EIO; return -EIO;
return 0; return 0;
} }
@ -251,7 +250,7 @@ static int assigned_device_enable_host_msi(struct kvm *kvm,
dev->host_irq = dev->dev->irq; dev->host_irq = dev->dev->irq;
if (request_threaded_irq(dev->host_irq, NULL, kvm_assigned_dev_thread, if (request_threaded_irq(dev->host_irq, NULL, kvm_assigned_dev_thread,
0, "kvm_assigned_msi_device", (void *)dev)) { 0, dev->irq_name, (void *)dev)) {
pci_disable_msi(dev->dev); pci_disable_msi(dev->dev);
return -EIO; return -EIO;
} }
@ -278,8 +277,7 @@ static int assigned_device_enable_host_msix(struct kvm *kvm,
for (i = 0; i < dev->entries_nr; i++) { for (i = 0; i < dev->entries_nr; i++) {
r = request_threaded_irq(dev->host_msix_entries[i].vector, r = request_threaded_irq(dev->host_msix_entries[i].vector,
NULL, kvm_assigned_dev_thread, NULL, kvm_assigned_dev_thread,
0, "kvm_assigned_msix_device", 0, dev->irq_name, (void *)dev);
(void *)dev);
if (r) if (r)
goto err; goto err;
} }
@ -336,6 +334,9 @@ static int assign_host_irq(struct kvm *kvm,
if (dev->irq_requested_type & KVM_DEV_IRQ_HOST_MASK) if (dev->irq_requested_type & KVM_DEV_IRQ_HOST_MASK)
return r; return r;
snprintf(dev->irq_name, sizeof(dev->irq_name), "kvm:%s",
pci_name(dev->dev));
switch (host_irq_type) { switch (host_irq_type) {
case KVM_DEV_IRQ_HOST_INTX: case KVM_DEV_IRQ_HOST_INTX:
r = assigned_device_enable_host_intx(kvm, dev); r = assigned_device_enable_host_intx(kvm, dev);