diff options
| author | Tim Deegan <Tim.Deegan@citrix.com> | 2011-05-24 08:19:39 +0100 |
|---|---|---|
| committer | Tim Deegan <Tim.Deegan@citrix.com> | 2011-05-24 08:19:39 +0100 |
| commit | 73160b42e543d4eafbe49f1c4bffd079d8271a86 (patch) | |
| tree | 5950ec9b1ed4fdf14b30b3db5e1c046b134e73cf | |
| parent | 385a1618504e4cd55d2d99f9995a172095a30a60 (diff) | |
| download | xen-73160b42e543d4eafbe49f1c4bffd079d8271a86.tar.gz xen-73160b42e543d4eafbe49f1c4bffd079d8271a86.tar.bz2 xen-73160b42e543d4eafbe49f1c4bffd079d8271a86.zip | |
drivers/passthrough: fix error paths in pci_add_device*()
When a device can't be allocated to dom0 by the IOMMU, don't leave
dom0 in the "domain" field. It causes pci_remove_device()
to crash trying to remove the dev from the domain's list of devices
(and was probably the wrong thing to do anyway).
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
xen-unstable changeset: 23371:4326bcd88b33
xen-unstable date: Mon May 23 18:35:32 2011 +0100
drivers/passthrough: Revert 23352:ea48976517af -- incorrect bugfix.
Signed-off-by: Keir Fraser <keir@xen.org>
xen-unstable changeset: 23370:2e6719425265
xen-unstable date: Mon May 23 18:35:04 2011 +0100
| -rw-r--r-- | xen/drivers/passthrough/pci.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index dbfe9dd57b..94312c788d 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -158,7 +158,10 @@ int pci_add_device(u8 bus, u8 devfn) pdev->domain = dom0; ret = iommu_add_device(pdev); if ( ret ) + { + pdev->domain = NULL; goto out; + } list_add(&pdev->domain_list, &dom0->arch.pdev_list); pci_enable_acs(pdev); @@ -173,11 +176,11 @@ out: int pci_remove_device(u8 bus, u8 devfn) { - struct pci_dev *pdev, *tmp; + struct pci_dev *pdev; int ret = -ENODEV; spin_lock(&pcidevs_lock); - list_for_each_entry_safe ( pdev, tmp, &alldevs_list, alldevs_list ) + list_for_each_entry ( pdev, &alldevs_list, alldevs_list ) if ( pdev->bus == bus && pdev->devfn == devfn ) { ret = iommu_remove_device(pdev); @@ -222,7 +225,10 @@ int pci_add_device_ext(u8 bus, u8 devfn, struct pci_dev_info *info) pdev->domain = dom0; ret = iommu_add_device(pdev); if ( ret ) + { + pdev->domain = NULL; goto out; + } list_add(&pdev->domain_list, &dom0->arch.pdev_list); pci_enable_acs(pdev); |