[Xen-changelog] [xen-unstable] ia64: Fix build for xen/ia64

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1253887965 -3600
# Node ID 731ea5884f8b343565ff5034be0369cf5e057b23
# Parent  e1bcf240e330fbd431a5dc38a871e143c26295e4
ia64: Fix build for xen/ia64

Define the related dummy functions and move the macros
as public to fix the build issue.

Signed-off-by: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
---
 xen/drivers/passthrough/io.c       |    1 +
 xen/include/asm-ia64/hvm/support.h |   11 +++++++++++
 xen/include/asm-x86/hvm/vlapic.h   |   10 ----------
 xen/include/xen/hvm/irq.h          |   10 ++++++++++
 4 files changed, 22 insertions(+), 10 deletions(-)

diff -r e1bcf240e330 -r 731ea5884f8b xen/drivers/passthrough/io.c
--- a/xen/drivers/passthrough/io.c      Fri Sep 25 10:50:18 2009 +0100
+++ b/xen/drivers/passthrough/io.c      Fri Sep 25 15:12:45 2009 +0100
@@ -22,6 +22,7 @@
 #include <xen/iommu.h>
 #include <asm/hvm/irq.h>
 #include <asm/hvm/iommu.h>
+#include <asm/hvm/support.h>
 #include <xen/hvm/irq.h>
 
 static void hvm_dirq_assist(unsigned long _d);
diff -r e1bcf240e330 -r 731ea5884f8b xen/include/asm-ia64/hvm/support.h
--- a/xen/include/asm-ia64/hvm/support.h        Fri Sep 25 10:50:18 2009 +0100
+++ b/xen/include/asm-ia64/hvm/support.h        Fri Sep 25 15:12:45 2009 +0100
@@ -25,4 +25,15 @@
 
 #include <xen/hvm/save.h>
 
+static int hvm_girq_dest_2_vcpu_id(struct domain *d, uint8_t dest,
+                                uint8_t dest_mode)
+{
+    /* TODO */
+}
+
+static void hvm_migrate_pirqs(struct vcpu *v)
+{
+    /* TODO */
+}
+
 #endif /* __ASM_IA64_HVM_SUPPORT_H__ */
diff -r e1bcf240e330 -r 731ea5884f8b xen/include/asm-x86/hvm/vlapic.h
--- a/xen/include/asm-x86/hvm/vlapic.h  Fri Sep 25 10:50:18 2009 +0100
+++ b/xen/include/asm-x86/hvm/vlapic.h  Fri Sep 25 15:12:45 2009 +0100
@@ -51,16 +51,6 @@
 
 #define vlapic_base_address(vlapic)                             \
     ((vlapic)->hw.apic_base_msr & MSR_IA32_APICBASE_BASE)
-
-#define VMSI_DEST_ID_MASK 0xff
-#define VMSI_RH_MASK      0x100
-#define VMSI_DM_MASK      0x200
-#define VMSI_DELIV_MASK   0x7000
-#define VMSI_TRIG_MODE    0x8000
-
-#define GFLAGS_SHIFT_RH             8
-#define GLFAGS_SHIFT_DELIV_MODE     12
-#define GLFAGS_SHIFT_TRG_MODE       15
 
 struct vlapic {
     struct hvm_hw_lapic      hw;
diff -r e1bcf240e330 -r 731ea5884f8b xen/include/xen/hvm/irq.h
--- a/xen/include/xen/hvm/irq.h Fri Sep 25 10:50:18 2009 +0100
+++ b/xen/include/xen/hvm/irq.h Fri Sep 25 15:12:45 2009 +0100
@@ -46,6 +46,16 @@ struct dev_intx_gsi_link {
 #define HVM_IRQ_DPCI_GUEST_PCI       (1 << _HVM_IRQ_DPCI_GUEST_PCI_SHIFT)
 #define HVM_IRQ_DPCI_GUEST_MSI       (1 << _HVM_IRQ_DPCI_GUEST_MSI_SHIFT)
 #define HVM_IRQ_DPCI_TRANSLATE       (1 << _HVM_IRQ_DPCI_TRANSLATE_SHIFT)
+
+#define VMSI_DEST_ID_MASK 0xff
+#define VMSI_RH_MASK      0x100
+#define VMSI_DM_MASK      0x200
+#define VMSI_DELIV_MASK   0x7000
+#define VMSI_TRIG_MODE    0x8000
+
+#define GFLAGS_SHIFT_RH             8
+#define GLFAGS_SHIFT_DELIV_MODE     12
+#define GLFAGS_SHIFT_TRG_MODE       15
 
 struct hvm_gmsi_info {
     uint32_t gvec;

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