diff -r 3a71e070e3c5 xen/drivers/passthrough/amd/pci_amd_iommu.c --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c Fri Sep 18 14:45:40 2009 +0100 +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c Fri Sep 25 16:08:20 2009 +0200 @@ -161,21 +161,15 @@ int amd_iov_detect(void) { INIT_LIST_HEAD(&amd_iommu_head); - if ( amd_iommu_detect_acpi() != 0 ) - { - AMD_IOMMU_DEBUG("Error detection\n"); - return -ENODEV; - } - - if ( !iommu_found() ) - { - printk("AMD_IOV: IOMMU not found!\n"); + if ( (amd_iommu_detect_acpi() !=0) || (iommu_found() == 0) ) + { + printk("AMD-Vi: IOMMU not found!\n"); return -ENODEV; } if ( amd_iommu_init() != 0 ) { - AMD_IOMMU_DEBUG("Error initialization\n"); + printk("Error initialization\n"); return -ENODEV; } return 0;