diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-09-25 15:12:45 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-09-25 15:12:45 +0100 |
| commit | 1b506ca9b0c7cb92003c6603c0bf2347077a5a54 (patch) | |
| tree | 2ac9acb2015313b755127bd64f278169946ee4b7 | |
| parent | 023e3bc72dc37d41f952e1c721c6ab4bf9370015 (diff) | |
| download | xen-1b506ca9b0c7cb92003c6603c0bf2347077a5a54.tar.gz xen-1b506ca9b0c7cb92003c6603c0bf2347077a5a54.tar.bz2 xen-1b506ca9b0c7cb92003c6603c0bf2347077a5a54.zip | |
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@intel.com>
| -rw-r--r-- | xen/drivers/passthrough/io.c | 1 | ||||
| -rw-r--r-- | xen/include/asm-ia64/hvm/support.h | 11 | ||||
| -rw-r--r-- | xen/include/asm-x86/hvm/vlapic.h | 10 | ||||
| -rw-r--r-- | xen/include/xen/hvm/irq.h | 10 |
4 files changed, 22 insertions, 10 deletions
diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index 052ab8d135..ffd0055082 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -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 --git a/xen/include/asm-ia64/hvm/support.h b/xen/include/asm-ia64/hvm/support.h index 19191674bd..399378e40e 100644 --- a/xen/include/asm-ia64/hvm/support.h +++ b/xen/include/asm-ia64/hvm/support.h @@ -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 --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index d882af2d54..880754d2ab 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -52,16 +52,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; struct hvm_hw_lapic_regs *regs; diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index a4cd6fc337..c1747ed73c 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -47,6 +47,16 @@ struct dev_intx_gsi_link { #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; uint32_t gflags; |