Skip to contentSkip to conversation

device-assignment: Clear assigned_dev irq type

PATCH Applied Alex Williamson 4 participants 4 messages Jun 29, 2010 – Jun 30, 2010 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 device-assignment: Clear assigned_dev irq type

Commit 96abccb5 cleared assigned_irq_data.flags when an irq is disabled, but what we really want is to clear assigned_dev->irq_requested_type.

---

 hw/device-assignment.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
hw/device-assignment.c +2 -2
index 585162b..48ac73c 100644
@@ -1044,7 +1044,7 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos)
         if (r && r != -ENXIO)
             perror("assigned_dev_update_msi: deassign irq");
 
-        assigned_irq_data.flags = 0;
+        assigned_dev->irq_requested_type = 0;
     }
 
     if (ctrl_byte & PCI_MSI_FLAGS_ENABLE) {
@@ -1208,7 +1208,7 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev, unsigned int ctrl_pos)
         if (r && r != -ENXIO)
             perror("assigned_dev_update_msix: deassign irq");
 
-        assigned_irq_data.flags = 0;
+        assigned_dev->irq_requested_type = 0;
     }
 
     if (*ctrl_word & PCI_MSIX_ENABLE) {
Acked-by on v1 1/1
#2 lore raw
In reply to Alex Williamson
Quoted 5 lines · Alex Williamson

Commit 96abccb5 cleared assigned_irq_data.flags when an irq is disabled, but what we really want is to clear assigned_dev->irq_requested_type.

Quoted 27 lines

---

 hw/device-assignment.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
hw/device-assignment.c +2 -2
index 585162b..48ac73c 100644
@@ -1044,7 +1044,7 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos)
         if (r && r != -ENXIO)
             perror("assigned_dev_update_msi: deassign irq");
 
-        assigned_irq_data.flags = 0;
+        assigned_dev->irq_requested_type = 0;
     }
 
     if (ctrl_byte & PCI_MSI_FLAGS_ENABLE) {
@@ -1208,7 +1208,7 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev, unsigned int ctrl_pos)
         if (r && r != -ENXIO)
             perror("assigned_dev_update_msix: deassign irq");
 
-        assigned_irq_data.flags = 0;
+        assigned_dev->irq_requested_type = 0;
     }
 
     if (*ctrl_word & PCI_MSIX_ENABLE) {