[Xen-devel] [PATCH 7/9] x86: move arch_evtchn_inject to x86 common code

[Wei Liu <wei.liu2@xxxxxxxxxx>]

It is not specific to HVM. It just so happens that PV doesn't need
special handling. Also enclose the code in CONFIG_HVM.

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 xen/arch/x86/hvm/irq.c | 6 ------
 xen/arch/x86/irq.c     | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
index 8095c82..dfe8ed6 100644
--- a/xen/arch/x86/hvm/irq.c
+++ b/xen/arch/x86/hvm/irq.c
@@ -577,12 +577,6 @@ int hvm_local_events_need_delivery(struct vcpu *v)
     return !hvm_interrupt_blocked(v, intack);
 }
 
-void arch_evtchn_inject(struct vcpu *v)
-{
-    if ( is_hvm_vcpu(v) )
-        hvm_assert_evtchn_irq(v);
-}
-
 static void irq_dump(struct domain *d)
 {
     struct hvm_irq *hvm_irq = hvm_domain_irq(d);
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 7d0b19f..1aeb02f 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -2732,3 +2732,11 @@ int allocate_and_map_msi_pirq(struct domain *d, int 
index, int *pirq_p,
 
     return ret;
 }
+
+void arch_evtchn_inject(struct vcpu *v)
+{
+#if CONFIG_HVM
+    if ( is_hvm_vcpu(v) )
+        hvm_assert_evtchn_irq(v);
+#endif
+}
-- 
git-series 0.9.1

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel