[Xen-changelog] [xen-unstable] ia64: Fix the missing msi.h by accident, and enhance the check

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1234947232 0
# Node ID 247023fb724c2708b89990bfa69a53bda559ff48
# Parent  7fe15a0ee3d85144e20f703e0f8ebc8c93af2444
ia64: Fix the missing msi.h by accident, and enhance the check
for one BUG_ON.

Signed-off-by: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
---
 xen/drivers/passthrough/vtd/ia64/vtd.c |    3 ++-
 xen/include/asm-ia64/msi.h             |   20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff -r 7fe15a0ee3d8 -r 247023fb724c xen/drivers/passthrough/vtd/ia64/vtd.c
--- a/xen/drivers/passthrough/vtd/ia64/vtd.c    Tue Feb 17 11:20:18 2009 +0000
+++ b/xen/drivers/passthrough/vtd/ia64/vtd.c    Wed Feb 18 08:53:52 2009 +0000
@@ -141,6 +141,7 @@ static int do_dom0_iommu_mapping(unsigne
 
 void iommu_set_dom0_mapping(struct domain *d)
 {
-       BUG_ON(d != dom0);
+       if (dom0)
+           BUG_ON(d != dom0);
        efi_memmap_walk(do_dom0_iommu_mapping, d);
 }
diff -r 7fe15a0ee3d8 -r 247023fb724c xen/include/asm-ia64/msi.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/include/asm-ia64/msi.h        Wed Feb 18 08:53:52 2009 +0000
@@ -0,0 +1,20 @@
+#ifndef __ASM_MSI_H
+#define __ASM_MSI_H
+
+/*
+ * MSI Defined Data Structures
+ */
+#define MSI_ADDRESS_HEADER             0xfee
+#define MSI_ADDRESS_HEADER_SHIFT       12
+#define MSI_ADDRESS_HEADER_MASK                0xfff000
+#define MSI_ADDRESS_DEST_ID_MASK       0xfff0000f
+#define MSI_TARGET_CPU_MASK            0xff
+#define MSI_TARGET_CPU_SHIFT           4
+#define MSI_DELIVERY_MODE              0
+#define MSI_LEVEL_MODE                 1       /* Edge always assert */
+#define MSI_TRIGGER_MODE               0       /* MSI is edge sensitive */
+#define MSI_PHYSICAL_MODE              0
+#define MSI_LOGICAL_MODE               1
+#define MSI_REDIRECTION_HINT_MODE      0
+
+#endif /* __ASM_MSI_H */

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