Fix build.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/common/domain.c b/xen/common/domain.c
index aa5dac5ebea4b2e8ef59b1bf1c0811920a04e326..6838b5c70644382cb7e0a39fd59921deffa1e8ec 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -97,11 +97,8 @@ static void __domain_finalise_shutdown(struct domain *d)
             return;
 
     d->is_shut_down = 1;
-    if ( d->shutdown_code == SHUTDOWN_suspend
-         && d->suspend_evtchn > 0 )
-    {
+    if ( (d->shutdown_code == SHUTDOWN_suspend) && d->suspend_evtchn )
         evtchn_set_pending(dom0->vcpu[0], d->suspend_evtchn);
-    }
     else
         send_guest_global_virq(dom0, VIRQ_DOM_EXC);
 }

diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
index fc105c5bd9efdec5916bf0f3d215109ab8bd14a7..f27efef13b23cb062cc40d502bbfc4ca55f4d2ed 100644 (file)
--- a/xen/common/event_channel.c
+++ b/xen/common/event_channel.c
@@ -56,8 +56,6 @@
         goto out;                                                   \
     } while ( 0 )
 
-static int evtchn_set_pending(struct vcpu *v, int port);
-
 static int virq_is_global(int virq)
 {
     int rc;
@@ -537,7 +535,7 @@ out:
 }
 
 
-static int evtchn_set_pending(struct vcpu *v, int port)
+int evtchn_set_pending(struct vcpu *v, int port)
 {
     struct domain *d = v->domain;
 

diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h
index a2d176c6b5c5d692f5fc663fea289af9725fad10..fadf01b7ec5da01eab48005e09cb03ab489cc798 100644 (file)
--- a/xen/include/xen/event.h
+++ b/xen/include/xen/event.h
@@ -16,6 +16,9 @@
 #include <asm/bitops.h>
 #include <asm/event.h>
 
+/* Returns TRUE if the delivery port was already pending. */
+int evtchn_set_pending(struct vcpu *v, int port);
+
 /*
  * send_guest_vcpu_virq: Notify guest via a per-VCPU VIRQ.
  *  @v:        VCPU to which virtual IRQ should be sent