@@ -184,7 +184,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
184
184
if (ret )
185
185
goto error ;
186
186
i = 0 ;
187
- for_each_pci_msi_entry (msidesc , dev ) {
187
+ msi_for_each_desc (msidesc , & dev -> dev , MSI_DESC_NOTASSOCIATED ) {
188
188
irq = xen_bind_pirq_msi_to_irq (dev , msidesc , v [i ],
189
189
(type == PCI_CAP_ID_MSI ) ? nvec : 1 ,
190
190
(type == PCI_CAP_ID_MSIX ) ?
@@ -235,7 +235,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
235
235
if (type == PCI_CAP_ID_MSI && nvec > 1 )
236
236
return 1 ;
237
237
238
- for_each_pci_msi_entry (msidesc , dev ) {
238
+ msi_for_each_desc (msidesc , & dev -> dev , MSI_DESC_NOTASSOCIATED ) {
239
239
pirq = xen_allocate_pirq_msi (dev , msidesc );
240
240
if (pirq < 0 ) {
241
241
irq = - ENODEV ;
@@ -270,7 +270,7 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
270
270
int ret = 0 ;
271
271
struct msi_desc * msidesc ;
272
272
273
- for_each_pci_msi_entry (msidesc , dev ) {
273
+ msi_for_each_desc (msidesc , & dev -> dev , MSI_DESC_NOTASSOCIATED ) {
274
274
struct physdev_map_pirq map_irq ;
275
275
domid_t domid ;
276
276
@@ -389,11 +389,9 @@ static void xen_teardown_msi_irqs(struct pci_dev *dev)
389
389
struct msi_desc * msidesc ;
390
390
int i ;
391
391
392
- for_each_pci_msi_entry (msidesc , dev ) {
393
- if (msidesc -> irq ) {
394
- for (i = 0 ; i < msidesc -> nvec_used ; i ++ )
395
- xen_destroy_irq (msidesc -> irq + i );
396
- }
392
+ msi_for_each_desc (msidesc , & dev -> dev , MSI_DESC_ASSOCIATED ) {
393
+ for (i = 0 ; i < msidesc -> nvec_used ; i ++ )
394
+ xen_destroy_irq (msidesc -> irq + i );
397
395
}
398
396
}
399
397
0 commit comments