KVM: Refactor IRQ names of assigned devices

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>

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 9fe7fefe76b1d3a53d6c87140f2ffc7693358b9f..4bd663d6443df185029ac4fa6259b8598b3e7da6 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -489,6 +489,7 @@ struct kvm_assigned_dev_kernel {
        struct pci_dev *dev;
        struct kvm *kvm;
        spinlock_t intx_lock;
+       char irq_name[32];
 };
 
 struct kvm_irq_mask_notifier {

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