ia64/xen-unstable

changeset 18625:0feedf7dcc73

vtd: Define msi_msg_{read,write}_remap_rte() to nothing for ia64.

Signed-off-by: Anthony Xu <anthony.xu@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Oct 14 11:28:37 2008 +0100 (2008-10-14)
parents 78af732db9a7
children 3ff2461bb5a1
files xen/drivers/passthrough/vtd/intremap.c xen/drivers/passthrough/vtd/iommu.c xen/drivers/passthrough/vtd/qinval.c xen/drivers/passthrough/vtd/utils.c
line diff
     1.1 --- a/xen/drivers/passthrough/vtd/intremap.c	Tue Oct 14 11:12:02 2008 +0100
     1.2 +++ b/xen/drivers/passthrough/vtd/intremap.c	Tue Oct 14 11:28:37 2008 +0100
     1.3 @@ -24,7 +24,6 @@
     1.4  #include <xen/time.h>
     1.5  #include <xen/pci.h>
     1.6  #include <xen/pci_regs.h>
     1.7 -#include <asm/msi.h>
     1.8  #include "iommu.h"
     1.9  #include "dmar.h"
    1.10  #include "vtd.h"
    1.11 @@ -269,6 +268,7 @@ void io_apic_write_remap_rte(
    1.12      *(IO_APIC_BASE(apic)+4) = *(((u32 *)&old_rte)+1);
    1.13  }
    1.14  
    1.15 +#if defined(__i386__) || defined(__x86_64__)
    1.16  static int remap_entry_to_msi_msg(
    1.17      struct iommu *iommu, struct msi_msg *msg)
    1.18  {
    1.19 @@ -452,6 +452,19 @@ void msi_msg_write_remap_rte(
    1.20  
    1.21      msi_msg_to_remap_entry(iommu, pdev, msg);
    1.22  }
    1.23 +#elif defined(__ia64__)
    1.24 +void msi_msg_read_remap_rte(
    1.25 +    struct msi_desc *msi_desc, struct msi_msg *msg)
    1.26 +{
    1.27 +    /* TODO. */
    1.28 +}
    1.29 +
    1.30 +void msi_msg_write_remap_rte(
    1.31 +    struct msi_desc *msi_desc, struct msi_msg *msg)
    1.32 +{
    1.33 +    /* TODO. */
    1.34 +}
    1.35 +#endif
    1.36  
    1.37  int intremap_setup(struct iommu *iommu)
    1.38  {
     2.1 --- a/xen/drivers/passthrough/vtd/iommu.c	Tue Oct 14 11:12:02 2008 +0100
     2.2 +++ b/xen/drivers/passthrough/vtd/iommu.c	Tue Oct 14 11:28:37 2008 +0100
     2.3 @@ -29,8 +29,6 @@
     2.4  #include <xen/pci.h>
     2.5  #include <xen/pci_regs.h>
     2.6  #include <xen/keyhandler.h>
     2.7 -#include <asm/paging.h>
     2.8 -#include <asm/msi.h>
     2.9  #include "iommu.h"
    2.10  #include "dmar.h"
    2.11  #include "extern.h"
     3.1 --- a/xen/drivers/passthrough/vtd/qinval.c	Tue Oct 14 11:12:02 2008 +0100
     3.2 +++ b/xen/drivers/passthrough/vtd/qinval.c	Tue Oct 14 11:28:37 2008 +0100
     3.3 @@ -24,7 +24,6 @@
     3.4  #include <xen/time.h>
     3.5  #include <xen/pci.h>
     3.6  #include <xen/pci_regs.h>
     3.7 -#include <asm/msi.h>
     3.8  #include "iommu.h"
     3.9  #include "dmar.h"
    3.10  #include "vtd.h"
     4.1 --- a/xen/drivers/passthrough/vtd/utils.c	Tue Oct 14 11:12:02 2008 +0100
     4.2 +++ b/xen/drivers/passthrough/vtd/utils.c	Tue Oct 14 11:28:37 2008 +0100
     4.3 @@ -23,7 +23,6 @@
     4.4  #include <xen/time.h>
     4.5  #include <xen/pci.h>
     4.6  #include <xen/pci_regs.h>
     4.7 -#include <asm/msi.h>
     4.8  #include "iommu.h"
     4.9  #include "dmar.h"
    4.10  #include "vtd.h"