aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-05-22 06:41:38 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-05-22 06:41:38 +0100
commit695bcb45249df9d65afd727b6fb67a2df3de07a7 (patch)
tree7473838ec8a72df5a40773a3bc3abca0ef9ad34c
parent5fa12b17bc5b0b725faf9141c22f3c995e0dd9d2 (diff)
downloadxen-695bcb45249df9d65afd727b6fb67a2df3de07a7.tar.gz
xen-695bcb45249df9d65afd727b6fb67a2df3de07a7.tar.bz2
xen-695bcb45249df9d65afd727b6fb67a2df3de07a7.zip
iommu: Gracefully fail to initialise iommu on generic x86 platforms.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com> xen-unstable changeset: 21446:93410e5e4ad8 xen-unstable date: Sat May 22 06:36:41 2010 +0100
-rw-r--r--xen/include/asm-x86/hvm/iommu.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/xen/include/asm-x86/hvm/iommu.h b/xen/include/asm-x86/hvm/iommu.h
index 13b4c56eb5..d488edff4d 100644
--- a/xen/include/asm-x86/hvm/iommu.h
+++ b/xen/include/asm-x86/hvm/iommu.h
@@ -1,6 +1,8 @@
#ifndef __ASM_X86_HVM_IOMMU_H__
#define __ASM_X86_HVM_IOMMU_H__
+#include <xen/errno.h>
+
struct iommu_ops;
extern const struct iommu_ops intel_iommu_ops;
extern const struct iommu_ops amd_iommu_ops;
@@ -31,7 +33,7 @@ static inline int iommu_hardware_setup(void)
case X86_VENDOR_AMD:
return amd_iov_detect();
default:
- BUG();
+ return -ENODEV;
}
return 0;