[Xen-changelog] [xen-unstable] ia64: fix build.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1236011090 0
# Node ID 310c85c9cb860bc0933caa426097d788f99dbb6e
# Parent  c62b453f27d5bf843890d47ec88e39be78efc0b1
ia64: fix build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/hvm/vmsi.c      |    6 ++----
 xen/drivers/passthrough/io.c |    9 +++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff -r c62b453f27d5 -r 310c85c9cb86 xen/arch/x86/hvm/vmsi.c
--- a/xen/arch/x86/hvm/vmsi.c   Mon Mar 02 14:09:21 2009 +0000
+++ b/xen/arch/x86/hvm/vmsi.c   Mon Mar 02 16:24:50 2009 +0000
@@ -378,13 +378,12 @@ static void del_msixtbl_entry(struct msi
     call_rcu(&entry->rcu, free_msixtbl_entry);
 }
 
-int msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable)
+void msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable)
 {
     irq_desc_t *irq_desc;
     struct msi_desc *msi_desc;
     struct pci_dev *pdev;
     struct msixtbl_entry *entry;
-    int r = -EINVAL;
 
     /* pcidevs_lock already held */
     irq_desc = domain_spin_lock_irq_desc(d, pirq, NULL);
@@ -418,8 +417,6 @@ found:
 
 out:
     spin_unlock_irq(&irq_desc->lock);
-    return r;
-
 }
 
 void msixtbl_pt_unregister(struct domain *d, int pirq)
@@ -461,6 +458,7 @@ found:
     spin_unlock(&d->arch.hvm_domain.msixtbl_list_lock);
     spin_unlock(&irq_desc->lock);
 }
+
 void msixtbl_pt_cleanup(struct domain *d, int pirq)
 {
     struct msixtbl_entry *entry, *temp;
diff -r c62b453f27d5 -r 310c85c9cb86 xen/drivers/passthrough/io.c
--- a/xen/drivers/passthrough/io.c      Mon Mar 02 14:09:21 2009 +0000
+++ b/xen/drivers/passthrough/io.c      Mon Mar 02 16:24:50 2009 +0000
@@ -58,8 +58,13 @@ static void pt_irq_time_out(void *data)
     pirq_guest_eoi(irq_map->dom, machine_gsi);
 }
 
-extern int msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable);
-extern int msixtbl_pt_unregister(struct domain *d, int pirq);
+#ifdef CONFIG_X86
+extern void msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable);
+extern void msixtbl_pt_unregister(struct domain *d, int pirq);
+#else
+#define msixtbl_pt_register(d, p, g) ((void)0)
+#define msixtbl_pt_unregister(d, p)  ((void)0)
+#endif
 
 int pt_irq_create_bind_vtd(
     struct domain *d, xen_domctl_bind_pt_irq_t *pt_irq_bind)

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