30 lines
811 B
Diff
30 lines
811 B
Diff
|
# HG changeset patch
|
||
|
|
# User Keir Fraser <keir.fraser@citrix.com>
|
||
|
|
# Date 1274506601 -3600
|
||
|
|
# Node ID 93410e5e4ad8799932ad31820d0d82c74d1f63a2
|
||
|
|
# Parent c1ed00d495342334980be576bbb8a2b1037b89c9
|
||
|
|
iommu: Gracefully fail to initialise iommu on generic x86 platforms.
|
||
|
|
|
||
|
|
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
|
||
|
|
|
||
|
|
--- 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(v
|
||
|
|
case X86_VENDOR_AMD:
|
||
|
|
return amd_iov_detect();
|
||
|
|
default:
|
||
|
|
- BUG();
|
||
|
|
+ return -ENODEV;
|
||
|
|
}
|
||
|
|
|
||
|
|
return 0;
|