[Xen-changelog] [xen stable-4.8] events: drop arch_evtchn_inject()

[patchbot@xxxxxxx]

commit fcf002d6c945502832f9f4cae45a9424e2cb396c
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu May 23 10:42:29 2019 -0700
Commit:     Julien Grall <julien.grall@xxxxxxx>
CommitDate: Fri Jun 14 15:45:59 2019 +0100

    events: drop arch_evtchn_inject()
    
    Have the only user call vcpu_mark_events_pending() instead, at the same
    time arranging for correct ordering of the writes (evtchn_pending_sel
    should be written before evtchn_upcall_pending).
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Julien Grall <julien.grall@xxxxxxx>
    Signed-off-by: Stefano Stabellini <stefanos@xxxxxxxxxx>
---
 xen/arch/arm/vgic.c     | 5 -----
 xen/common/domain.c     | 3 +--
 xen/include/xen/event.h | 3 ---
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 60af06805d..53d43b49a1 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -537,11 +537,6 @@ void vgic_vcpu_inject_spi(struct domain *d, unsigned int 
virq)
     vgic_vcpu_inject_irq(v, virq);
 }
 
-void arch_evtchn_inject(struct vcpu *v)
-{
-    vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq);
-}
-
 int vgic_emulate(struct cpu_user_regs *regs, union hsr hsr)
 {
     struct vcpu *v = current;
diff --git a/xen/common/domain.c b/xen/common/domain.c
index b574551188..314f880a92 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -1206,10 +1206,9 @@ int map_vcpu_info(struct vcpu *v, unsigned long gfn, 
unsigned offset)
      * Mark everything as being pending just to make sure nothing gets
      * lost.  The domain will get a spurious event, but it can cope.
      */
-    vcpu_info(v, evtchn_upcall_pending) = 1;
     for ( i = 0; i < BITS_PER_EVTCHN_WORD(d); i++ )
         set_bit(i, &vcpu_info(v, evtchn_pending_sel));
-    arch_evtchn_inject(v);
+    vcpu_mark_events_pending(v);
 
     return 0;
 }
diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h
index 82caddbe76..945c2e7049 100644
--- a/xen/include/xen/event.h
+++ b/xen/include/xen/event.h
@@ -68,9 +68,6 @@ int guest_enabled_event(struct vcpu *v, uint32_t virq);
 /* Notify remote end of a Xen-attached event channel.*/
 void notify_via_xen_event_channel(struct domain *ld, int lport);
 
-/* Inject an event channel notification into the guest */
-void arch_evtchn_inject(struct vcpu *v);
-
 /*
  * Internal event channel object storage.
  *
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.8

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog