ia64/xen-unstable

changeset 17968:9353f9931d96

Fix build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Jul 04 12:20:19 2008 +0100 (2008-07-04)
parents d711529e3de1
children 6c2fe520e32d
files xen/common/domain.c xen/common/event_channel.c xen/include/xen/event.h
line diff
     1.1 --- a/xen/common/domain.c	Fri Jul 04 12:17:33 2008 +0100
     1.2 +++ b/xen/common/domain.c	Fri Jul 04 12:20:19 2008 +0100
     1.3 @@ -97,11 +97,8 @@ static void __domain_finalise_shutdown(s
     1.4              return;
     1.5  
     1.6      d->is_shut_down = 1;
     1.7 -    if ( d->shutdown_code == SHUTDOWN_suspend
     1.8 -         && d->suspend_evtchn > 0 )
     1.9 -    {
    1.10 +    if ( (d->shutdown_code == SHUTDOWN_suspend) && d->suspend_evtchn )
    1.11          evtchn_set_pending(dom0->vcpu[0], d->suspend_evtchn);
    1.12 -    }
    1.13      else
    1.14          send_guest_global_virq(dom0, VIRQ_DOM_EXC);
    1.15  }
     2.1 --- a/xen/common/event_channel.c	Fri Jul 04 12:17:33 2008 +0100
     2.2 +++ b/xen/common/event_channel.c	Fri Jul 04 12:20:19 2008 +0100
     2.3 @@ -56,8 +56,6 @@
     2.4          goto out;                                                   \
     2.5      } while ( 0 )
     2.6  
     2.7 -static int evtchn_set_pending(struct vcpu *v, int port);
     2.8 -
     2.9  static int virq_is_global(int virq)
    2.10  {
    2.11      int rc;
    2.12 @@ -537,7 +535,7 @@ out:
    2.13  }
    2.14  
    2.15  
    2.16 -static int evtchn_set_pending(struct vcpu *v, int port)
    2.17 +int evtchn_set_pending(struct vcpu *v, int port)
    2.18  {
    2.19      struct domain *d = v->domain;
    2.20  
     3.1 --- a/xen/include/xen/event.h	Fri Jul 04 12:17:33 2008 +0100
     3.2 +++ b/xen/include/xen/event.h	Fri Jul 04 12:20:19 2008 +0100
     3.3 @@ -16,6 +16,9 @@
     3.4  #include <asm/bitops.h>
     3.5  #include <asm/event.h>
     3.6  
     3.7 +/* Returns TRUE if the delivery port was already pending. */
     3.8 +int evtchn_set_pending(struct vcpu *v, int port);
     3.9 +
    3.10  /*
    3.11   * send_guest_vcpu_virq: Notify guest via a per-VCPU VIRQ.
    3.12   *  @v:        VCPU to which virtual IRQ should be sent