Skip to contentSkip to conversation

pci-assign: Fix transition MSI->INTx

PATCH Applied Jan Kiszka 5 participants 5 messages Jan 4, 2011 – Jan 7, 2011 KVM

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 pci-assign: Fix transition MSI->INTx

From: Jan Kiszka <[email protected]>

Make sure to re-register the IRQ of an assigned device as INTx when the guest disables MSI[X] mode again.

Signed-off-by Jan Kiszka <[email protected]>
---
 hw/device-assignment.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
hw/device-assignment.c +6 -0
index f6410f8..fce7567 100644
@@ -1192,7 +1192,10 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos)
         if (kvm_assign_irq(kvm_context, &assigned_irq_data) < 0)
             perror("assigned_dev_enable_msi: assign irq");
 
+        assigned_dev->girq = -1;
         assigned_dev->irq_requested_type = assigned_irq_data.flags;
+    } else {
+        assign_irq(assigned_dev);
     }
 }
 #endif

@@ -1332,7 +1335,10 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev, unsigned int ctrl_pos)
             perror("assigned_dev_enable_msix: assign irq");
             return;
         }
+        assigned_dev->girq = -1;
         assigned_dev->irq_requested_type = assigned_irq_data.flags;
+    } else {
+        assign_irq(assigned_dev);
     }
 }
 #endif
Signature · 1 line
1.7.1
#1 lore raw
Quoted 6 lines · Jan Kiszka

From: Jan Kiszka<[email protected]>

Make sure to re-register the IRQ of an assigned device as INTx when the guest disables MSI[X] mode again.

Signed-off-by Jan Kiszka<[email protected]>
Cc More Reviewers
Quoted 30 lines
---
  hw/device-assignment.c |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)
hw/device-assignment.c +6 -0
index f6410f8..fce7567 100644
@@ -1192,7 +1192,10 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos)
          if (kvm_assign_irq(kvm_context,&assigned_irq_data)<  0)
              perror("assigned_dev_enable_msi: assign irq");
 
+        assigned_dev->girq = -1;
          assigned_dev->irq_requested_type = assigned_irq_data.flags;
+    } else {
+        assign_irq(assigned_dev);
      }
  }
  #endif

@@ -1332,7 +1335,10 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev, unsigned int ctrl_pos)
              perror("assigned_dev_enable_msix: assign irq");
              return;
          }
+        assigned_dev->girq = -1;
          assigned_dev->irq_requested_type = assigned_irq_data.flags;
+    } else {
+        assign_irq(assigned_dev);
      }
  }
  #endif
Signature · 1 line
error compiling committee.c: too many arguments to function
Acked-by
#2 lore raw
Quoted 9 lines · Avi Kivity
Quoted 6 lines · Jan Kiszka

From: Jan Kiszka<[email protected]>

Make sure to re-register the IRQ of an assigned device as INTx when the guest disables MSI[X] mode again.

Signed-off-by Jan Kiszka<[email protected]>
Cc More Reviewers

Looks fine to me.

Acked-by Alex Williamson <[email protected]>
Quoted 32 lines
Quoted 30 lines
---
  hw/device-assignment.c |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)
hw/device-assignment.c +6 -0
index f6410f8..fce7567 100644
@@ -1192,7 +1192,10 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos)
          if (kvm_assign_irq(kvm_context,&assigned_irq_data)<  0)
              perror("assigned_dev_enable_msi: assign irq");
 
+        assigned_dev->girq = -1;
          assigned_dev->irq_requested_type = assigned_irq_data.flags;
+    } else {
+        assign_irq(assigned_dev);
      }
  }
  #endif

@@ -1332,7 +1335,10 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev, unsigned int ctrl_pos)
              perror("assigned_dev_enable_msix: assign irq");
              return;
          }
+        assigned_dev->girq = -1;
          assigned_dev->irq_requested_type = assigned_irq_data.flags;
+    } else {
+        assign_irq(assigned_dev);
      }
  }
  #endif
Acked-by on v1 1/1
#3 lore raw
In reply to Jan Kiszka
Quoted 6 lines · Jan Kiszka

From: Jan Kiszka <[email protected]>

Make sure to re-register the IRQ of an assigned device as INTx when the guest disables MSI[X] mode again.

Signed-off-by Jan Kiszka <[email protected]>
Acked-by Michael S. Tsirkin <[email protected]>
Quoted 36 lines
---
 hw/device-assignment.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
hw/device-assignment.c +6 -0
index f6410f8..fce7567 100644
@@ -1192,7 +1192,10 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos)
         if (kvm_assign_irq(kvm_context, &assigned_irq_data) < 0)
             perror("assigned_dev_enable_msi: assign irq");
 
+        assigned_dev->girq = -1;
         assigned_dev->irq_requested_type = assigned_irq_data.flags;
+    } else {
+        assign_irq(assigned_dev);
     }
 }
 #endif

@@ -1332,7 +1335,10 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev, unsigned int ctrl_pos)
             perror("assigned_dev_enable_msix: assign irq");
             return;
         }
+        assigned_dev->girq = -1;
         assigned_dev->irq_requested_type = assigned_irq_data.flags;
+    } else {
+        assign_irq(assigned_dev);
     }
 }
 #endif
Signature · 5 lines
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html