notify_via_xen_event_channel() takes explicit domain parameter.

Also remove pointless tasklet from mem_event notify path.

Signed-off-by: John Byrne <john.l.byrne@hp.com>

diff --git a/xen/arch/ia64/vmx/vmx_support.c b/xen/arch/ia64/vmx/vmx_support.c
index f66d988ef368625ce21bf34c7fc4397be02810ca..98ce5c951128507ec0c947d92bd9cfa84fbcb0bf 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_support.c
+++ b/xen/arch/ia64/vmx/vmx_support.c
@@ -62,7 +62,7 @@ void vmx_send_assist_req(struct vcpu *v)
     }
     wmb();
     p->state = STATE_IOREQ_READY;
-    notify_via_xen_event_channel(v->arch.arch_vmx.xen_port);
+    notify_via_xen_event_channel(v->domain, v->arch.arch_vmx.xen_port);
 
     for (;;) {
         if (p->state != STATE_IOREQ_READY &&

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 022b4b79b19f0111118eb437be6ed575ca4f3773..8301cb624c617fdb0cfad5a0d564e34c5e631915 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -930,7 +930,7 @@ bool_t hvm_send_assist_req(struct vcpu *v)
      * prepare_wait_on_xen_event_channel() is an implicit barrier.
      */
     p->state = STATE_IOREQ_READY;
-    notify_via_xen_event_channel(v->arch.hvm_vcpu.xen_port);
+    notify_via_xen_event_channel(v->domain, v->arch.hvm_vcpu.xen_port);
 
     return 1;
 }

diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c
index 10ea0655c9aadbf45f3c10a41ea009175245a145..5584328dd638ea7fcce48e152284cf03eeea0ab8 100644 (file)
--- a/xen/arch/x86/mm/mem_event.c
+++ b/xen/arch/x86/mm/mem_event.c
@@ -35,13 +35,6 @@
 #define MEM_EVENT_RING_THRESHOLD 4
 
 
-static void mem_event_notify(struct domain *d)
-{
-    prepare_wait_on_xen_event_channel(d->mem_event.xen_port);
-    notify_via_xen_event_channel(d->mem_event.xen_port);
-}
-
-
 int mem_event_enable(struct domain *d, mfn_t ring_mfn, mfn_t shared_mfn)
 {
     int rc;
@@ -64,11 +57,6 @@ int mem_event_enable(struct domain *d, mfn_t ring_mfn, mfn_t shared_mfn)
     ((mem_event_shared_page_t *)d->mem_event.shared_page)->port = rc;
     d->mem_event.xen_port = rc;
 
-    /* Initialise tasklet */
-    tasklet_init(&d->mem_event.tasklet,
-                 (void(*)(unsigned long))mem_event_notify,
-                 (unsigned long)d);
-
     /* Prepare ring buffer */
     FRONT_RING_INIT(&d->mem_event.front_ring,
                     (mem_event_sring_t *)d->mem_event.ring_page,
@@ -125,7 +113,7 @@ void mem_event_put_request(struct domain *d, mem_event_request_t *req)
 
     mem_event_ring_unlock(d);
 
-    tasklet_schedule(&d->mem_event.tasklet);
+    notify_via_xen_event_channel(d, d->mem_event.xen_port);
 }
 
 void mem_event_get_response(struct domain *d, mem_event_response_t *rsp)

diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
index b6a15d68a4a59eee9cf76dd80f2a6c79de759eb5..0fe798098cdb7d8c0251aa8b53d4dcf8ffb98bc0 100644 (file)
--- a/xen/common/event_channel.c
+++ b/xen/common/event_channel.c
@@ -986,10 +986,10 @@ void free_xen_event_channel(
 }
 
 
-void notify_via_xen_event_channel(int lport)
+void notify_via_xen_event_channel(struct domain *ld, int lport)
 {
     struct evtchn *lchn, *rchn;
-    struct domain *ld = current->domain, *rd;
+    struct domain *rd;
     int            rport;
 
     spin_lock(&ld->event_lock);

diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h
index b366e582a8eba95a028f87138ef1deb12001f8f5..0adb2eb93e37a6da9e9bc8e233c8088ef5bc499c 100644 (file)
--- a/xen/include/xen/event.h
+++ b/xen/include/xen/event.h
@@ -57,7 +57,7 @@ void free_xen_event_channel(
 int guest_enabled_event(struct vcpu *v, int virq);
 
 /* Notify remote end of a Xen-attached event channel.*/
-void notify_via_xen_event_channel(int lport);
+void notify_via_xen_event_channel(struct domain *ld, int lport);
 
 /* Wait on a Xen-attached event channel. */
 #define wait_on_xen_event_channel(port, condition)                      \

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 9025980dbfe1bdcffa50f6e89e970a53acb2a295..8785555e91eb1cec2d44e79bdfe5db4888cc309a 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -190,8 +190,6 @@ struct mem_event_domain
     bool_t enabled;
     /* event channel port (vcpu0 only) */
     int xen_port;
-    /* tasklet */
-    struct tasklet tasklet;
 };
  
 struct domain