[Xen-changelog] [xen-unstable] Fix build.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1215170419 -3600
# Node ID 9353f9931d9671d683b94ecdfd124c3a6d9cef68
# Parent  d711529e3de1552b00b4eced40ba659787f70b5d
Fix build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/common/domain.c        |    5 +----
 xen/common/event_channel.c |    4 +---
 xen/include/xen/event.h    |    3 +++
 3 files changed, 5 insertions(+), 7 deletions(-)

diff -r d711529e3de1 -r 9353f9931d96 xen/common/domain.c
--- a/xen/common/domain.c       Fri Jul 04 12:17:33 2008 +0100
+++ b/xen/common/domain.c       Fri Jul 04 12:20:19 2008 +0100
@@ -97,11 +97,8 @@ static void __domain_finalise_shutdown(s
             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 -r d711529e3de1 -r 9353f9931d96 xen/common/event_channel.c
--- a/xen/common/event_channel.c        Fri Jul 04 12:17:33 2008 +0100
+++ b/xen/common/event_channel.c        Fri Jul 04 12:20:19 2008 +0100
@@ -55,8 +55,6 @@
         rc = (_errno);                                              \
         goto out;                                                   \
     } while ( 0 )
-
-static int evtchn_set_pending(struct vcpu *v, int port);
 
 static int virq_is_global(int virq)
 {
@@ -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 -r d711529e3de1 -r 9353f9931d96 xen/include/xen/event.h
--- a/xen/include/xen/event.h   Fri Jul 04 12:17:33 2008 +0100
+++ b/xen/include/xen/event.h   Fri Jul 04 12:20:19 2008 +0100
@@ -15,6 +15,9 @@
 #include <xen/softirq.h>
 #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.

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog