From 7be7b15dde4364b6f524aa9330a283c60b7708ea Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Tue, 23 Apr 2013 12:19:26 +0100 Subject: xen: introduce vcpu_block Rename do_block to vcpu_block. Move the call to local_event_delivery_enable out of vcpu_block, to a new static function called vcpu_block_enable_events. Use vcpu_block_enable_events instead of do_block throughout in schedule.c Signed-off-by: Stefano Stabellini Acked-by: Keir Fraser --- xen/common/schedule.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'xen/common/schedule.c') diff --git a/xen/common/schedule.c b/xen/common/schedule.c index c1cd3d0f15..e52660236a 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -677,11 +677,10 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) } /* Block the currently-executing domain until a pertinent event occurs. */ -static long do_block(void) +void vcpu_block(void) { struct vcpu *v = current; - local_event_delivery_enable(); set_bit(_VPF_blocked, &v->pause_flags); /* Check for events /after/ blocking: avoids wakeup waiting race. */ @@ -694,8 +693,12 @@ static long do_block(void) TRACE_2D(TRC_SCHED_BLOCK, v->domain->domain_id, v->vcpu_id); raise_softirq(SCHEDULE_SOFTIRQ); } +} - return 0; +static void vcpu_block_enable_events(void) +{ + local_event_delivery_enable(); + vcpu_block(); } static long do_poll(struct sched_poll *sched_poll) @@ -870,7 +873,7 @@ long do_sched_op_compat(int cmd, unsigned long arg) case SCHEDOP_block: { - ret = do_block(); + vcpu_block_enable_events(); break; } @@ -907,7 +910,7 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case SCHEDOP_block: { - ret = do_block(); + vcpu_block_enable_events(); break; } -- cgit v1.2.3