[Xen-changelog] [xen-unstable] AMD IOMMU: Fix boot output on non-iommu system

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1254122906 -3600
# Node ID d74302fc00e625221e317900a95ecfb2a7fba37a
# Parent  623aa5c2eaa47b5a1ae1bad578beda06013a79d4
AMD IOMMU: Fix boot output on non-iommu system

Signed-off-by: Wei Wang <wei.wang2@xxxxxxx>
---
 xen/drivers/passthrough/amd/pci_amd_iommu.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff -r 623aa5c2eaa4 -r d74302fc00e6 xen/drivers/passthrough/amd/pci_amd_iommu.c
--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c       Fri Sep 25 15:20:58 
2009 +0100
+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c       Mon Sep 28 08:28:26 
2009 +0100
@@ -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;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog