# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1223980117 -3600
# Node ID 0feedf7dcc7375d2d21723f55522060d10a8b755
# Parent 78af732db9a7738c495fac1e4b364762c35a4326
vtd: Define msi_msg_{read,write}_remap_rte() to nothing for ia64.
Signed-off-by: Anthony Xu <anthony.xu@xxxxxxxxx>
Signed-off-by: Dexuan Cui <dexuan.cui@xxxxxxxxx>
---
xen/drivers/passthrough/vtd/intremap.c | 15 ++++++++++++++-
xen/drivers/passthrough/vtd/iommu.c | 2 --
xen/drivers/passthrough/vtd/qinval.c | 1 -
xen/drivers/passthrough/vtd/utils.c | 1 -
4 files changed, 14 insertions(+), 5 deletions(-)
diff -r 78af732db9a7 -r 0feedf7dcc73 xen/drivers/passthrough/vtd/intremap.c
--- a/xen/drivers/passthrough/vtd/intremap.c Tue Oct 14 11:12:02 2008 +0100
+++ b/xen/drivers/passthrough/vtd/intremap.c Tue Oct 14 11:28:37 2008 +0100
@@ -24,7 +24,6 @@
#include <xen/time.h>
#include <xen/pci.h>
#include <xen/pci_regs.h>
-#include <asm/msi.h>
#include "iommu.h"
#include "dmar.h"
#include "vtd.h"
@@ -269,6 +268,7 @@ void io_apic_write_remap_rte(
*(IO_APIC_BASE(apic)+4) = *(((u32 *)&old_rte)+1);
}
+#if defined(__i386__) || defined(__x86_64__)
static int remap_entry_to_msi_msg(
struct iommu *iommu, struct msi_msg *msg)
{
@@ -452,6 +452,19 @@ void msi_msg_write_remap_rte(
msi_msg_to_remap_entry(iommu, pdev, msg);
}
+#elif defined(__ia64__)
+void msi_msg_read_remap_rte(
+ struct msi_desc *msi_desc, struct msi_msg *msg)
+{
+ /* TODO. */
+}
+
+void msi_msg_write_remap_rte(
+ struct msi_desc *msi_desc, struct msi_msg *msg)
+{
+ /* TODO. */
+}
+#endif
int intremap_setup(struct iommu *iommu)
{
diff -r 78af732db9a7 -r 0feedf7dcc73 xen/drivers/passthrough/vtd/iommu.c
--- a/xen/drivers/passthrough/vtd/iommu.c Tue Oct 14 11:12:02 2008 +0100
+++ b/xen/drivers/passthrough/vtd/iommu.c Tue Oct 14 11:28:37 2008 +0100
@@ -29,8 +29,6 @@
#include <xen/pci.h>
#include <xen/pci_regs.h>
#include <xen/keyhandler.h>
-#include <asm/paging.h>
-#include <asm/msi.h>
#include "iommu.h"
#include "dmar.h"
#include "extern.h"
diff -r 78af732db9a7 -r 0feedf7dcc73 xen/drivers/passthrough/vtd/qinval.c
--- a/xen/drivers/passthrough/vtd/qinval.c Tue Oct 14 11:12:02 2008 +0100
+++ b/xen/drivers/passthrough/vtd/qinval.c Tue Oct 14 11:28:37 2008 +0100
@@ -24,7 +24,6 @@
#include <xen/time.h>
#include <xen/pci.h>
#include <xen/pci_regs.h>
-#include <asm/msi.h>
#include "iommu.h"
#include "dmar.h"
#include "vtd.h"
diff -r 78af732db9a7 -r 0feedf7dcc73 xen/drivers/passthrough/vtd/utils.c
--- a/xen/drivers/passthrough/vtd/utils.c Tue Oct 14 11:12:02 2008 +0100
+++ b/xen/drivers/passthrough/vtd/utils.c Tue Oct 14 11:28:37 2008 +0100
@@ -23,7 +23,6 @@
#include <xen/time.h>
#include <xen/pci.h>
#include <xen/pci_regs.h>
-#include <asm/msi.h>
#include "iommu.h"
#include "dmar.h"
#include "vtd.h"
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home