Before the chang, if setting iommu=0 option in xen boot option, the
painc info is "Couldn't enable IOMMU and iomm=required/force", this
will confuse the users because the iommu has been disabled.
Signed-off-by: Liang Li <liang.z...@intel.com>
---
xen/arch/x86/apic.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index 39cd9e5..50f795f 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -915,6 +915,11 @@ void __init x2apic_bsp_setup(void)
return;
}
printk("x2APIC: Already enabled by BIOS: Ignoring cmdline disable.\n");
+ } else {
+ if ( !iommu_enable) {
+ panic("x2APIC should be disabled while IOMMU is disabled,"
+ "try to set x2apic=0 in cmdline and disable x2apic in BIOS");
+ }
}
if ( !iommu_supports_eim() )
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
