commit b795dcb53c7a928c99ca6d0aede8183df0d63c5f
author Jan Kiszka <jan.kiszka@siemens.com> Tue Aug 23 19:32:58 2011 +0200
committer Andreas Färber <afaerber@suse.de> Tue Oct 09 18:51:47 2012 +0200
tree 0742cf57c8e981b735ec48cfc3b573f9e4b3759d
parent a0e5b3b9466ecf632a6454ad33d47f6c20df11bc

pci-assign: Update legacy interrupts only if used

Don't mess with assign_intx on devices that are in MSI or MSI-X mode, it
would corrupt their interrupt routing.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
(cherry picked from commit 096392efe1e5ee670f880c96c31f7ea8d6d76cf4)

Signed-off-by: Andreas Färber <afaerber@suse.de>

hw/device-assignment.c

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index d586ce4..43029a4 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1062,9 +1062,12 @@
     dev = QLIST_FIRST(&devs);
     while (dev) {
         next = QLIST_NEXT(dev, next);
-        r = assign_irq(dev);
-        if (r < 0)
-            qdev_unplug(&dev->dev.qdev);
+        if (dev->irq_requested_type & KVM_DEV_IRQ_HOST_INTX) {
+            r = assign_irq(dev);
+            if (r < 0) {
+                qdev_unplug(&dev->dev.qdev);
+            }
+        }
         dev = next;
     }
 }