1.1 --- a/xen/common/schedule.c	Sat Apr 22 10:14:11 2006 +0100
     1.2 +++ b/xen/common/schedule.c	Sat Apr 22 10:26:28 2006 +0100
     1.3 @@ -42,7 +42,7 @@ string_param("sched", opt_sched);
     1.4  /* Various timer handlers. */
     1.5  static void s_timer_fn(void *unused);
     1.6  static void t_timer_fn(void *unused);
     1.7 -static void dom_timer_fn(void *data);
     1.8 +static void vcpu_timer_fn(void *data);
     1.9  static void poll_timer_fn(void *data);
    1.10  
    1.11  /* This is global for now so that private implementations can reach it */
    1.12 @@ -167,7 +167,7 @@ struct vcpu *alloc_vcpu(
    1.13  void sched_add_domain(struct vcpu *v) 
    1.14  {
    1.15      /* Initialise the per-domain timers. */
    1.16 -    init_timer(&v->timer, dom_timer_fn, v, v->processor);
    1.17 +    init_timer(&v->timer, vcpu_timer_fn, v, v->processor);
    1.18      init_timer(&v->poll_timer, poll_timer_fn, v, v->processor);
    1.19  
    1.20      if ( is_idle_vcpu(v) )
    1.21 @@ -642,12 +642,10 @@ static void t_timer_fn(void *unused)
    1.22      set_timer(&t_timer[cpu], NOW() + MILLISECS(10));
    1.23  }
    1.24  
    1.25 -/* Domain timer function, sends a virtual timer interrupt to domain */
    1.26 -static void dom_timer_fn(void *data)
    1.27 +/* Per-VCPU timer function: sends a virtual timer interrupt. */
    1.28 +static void vcpu_timer_fn(void *data)
    1.29  {
    1.30      struct vcpu *v = data;
    1.31 -
    1.32 -    update_vcpu_system_time(v);
    1.33      send_timer_event(v);
    1.34  }
    1.35