x86: move hvm_domain_use_pirq to hvm files

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
index 37040d1d479bf07c261efddc2629afcfe111ceee..e03a87ad50135903acb829be9f02e2cd1f2f823d 100644 (file)
--- a/xen/arch/x86/hvm/irq.c
+++ b/xen/arch/x86/hvm/irq.c
@@ -27,6 +27,11 @@
 #include <asm/hvm/support.h>
 #include <asm/msi.h>
 
+bool hvm_domain_use_pirq(const struct domain *d, const struct pirq *pirq)
+{
+    return is_hvm_domain(d) && pirq && pirq->arch.hvm.emuirq != IRQ_UNBOUND;
+}
+
 /* Must be called with hvm_domain->irq_lock hold */
 static void assert_gsi(struct domain *d, unsigned ioapic_gsi)
 {

diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index ec93ab60e5f984917da6e0122e165c3151082cd0..35e7de594fd85749401bbb409fae174a037dec57 100644 (file)
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -2567,11 +2567,6 @@ void arch_evtchn_bind_pirq(struct domain *d, int pirq)
     spin_unlock_irqrestore(&desc->lock, flags);
 }
 
-bool hvm_domain_use_pirq(const struct domain *d, const struct pirq *pirq)
-{
-    return is_hvm_domain(d) && pirq && pirq->arch.hvm.emuirq != IRQ_UNBOUND;
-}
-
 static int allocate_pirq(struct domain *d, int index, int pirq, int irq,
                          int type, int *nr)
 {

diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h
index 2e6fa70a4709c90f744b8cd5b873f1fa6b048bc4..a2c9938ccf0d18daf477ba41d04735e5fb1a87ae 100644 (file)
--- a/xen/include/asm-x86/hvm/irq.h
+++ b/xen/include/asm-x86/hvm/irq.h
@@ -215,4 +215,7 @@ void hvm_maybe_deassert_evtchn_irq(void);
 void hvm_assert_evtchn_irq(struct vcpu *v);
 void hvm_set_callback_via(struct domain *d, uint64_t via);
 
+struct pirq;
+bool hvm_domain_use_pirq(const struct domain *, const struct pirq *);
+
 #endif /* __ASM_X86_HVM_IRQ_H__ */

diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h
index 054c3ab6be2f1ba785b02f3df4d98caa4e77e39d..4b39997f09ea63a21338322d033bbc0d0cdcc66e 100644 (file)
--- a/xen/include/asm-x86/irq.h
+++ b/xen/include/asm-x86/irq.h
@@ -145,7 +145,6 @@ int get_free_pirqs(struct domain *, unsigned int nr);
 void free_domain_pirqs(struct domain *d);
 int map_domain_emuirq_pirq(struct domain *d, int pirq, int irq);
 int unmap_domain_pirq_emuirq(struct domain *d, int pirq);
-bool hvm_domain_use_pirq(const struct domain *, const struct pirq *);
 
 /* Reset irq affinities to match the given CPU mask. */
 void fixup_irqs(const cpumask_t *mask, bool verbose);