bitkeeper revision 1.825.1.2 (4062c7cfNjG5kiKHfguNA2SIXnllng)

Many files:
  New IRQ upcall world.
evtchn.c:
  Rename: xenolinux-2.4.25-sparse/arch/xen/kernel/hypervisor.c -> xenolinux-2.4.25-sparse/arch/xen/kernel/evtchn.c

2 files changed, 6 insertions, 5 deletions

diff --git a/tools/xend/lib/main.py b/tools/xend/lib/main.py
index 15b2f089cc..6cbfa5ad35 100755
--- a/tools/xend/lib/main.py
+++ b/tools/xend/lib/main.py
@@ -175,16 +175,16 @@ def daemon_loop():
             # getting clogged with stale connections.
             if type == notifier.DISCONNECT:
                 ret = xc.evtchn_status(idx)
-                if ret['status'] != 'connected':
+                if ret['status'] == 'interdomain':
                     notifier.clear(idx, notifier.NORMAL)
                     notifier.clear(idx, notifier.DISCONNECT)
                     if control_list.has_key(idx):
                         (port, rbuf, wbuf, con_if) =  control_list[idx]
                         con_if.close()
                         del control_list[idx], port, rbuf, wbuf, con_if
-                    elif ret['status'] == 'disconnected':
-                        # There's noone to do the closure for us...
-                        xc.evtchn_close(idx)
+                elif ret['status'] == 'unbound':
+                    # There's noone to do the closure for us...
+                    xc.evtchn_close(idx)
 
             # A standard notification: probably means there are messages to
             # read or that there is space to write messages.
diff --git a/tools/xend/lib/utils.c b/tools/xend/lib/utils.c
index 07cba257f5..e57b7ed9d3 100644
--- a/tools/xend/lib/utils.c
+++ b/tools/xend/lib/utils.c
@@ -632,7 +632,8 @@ static PyObject *xu_port_new(PyObject *self, PyObject *args)
         goto fail2;
     }
 
-    if ( xc_evtchn_open(xup->xc_handle, DOMID_SELF, dom, &port1, &port2) != 0 )
+    if ( xc_evtchn_bind_interdomain(xup->xc_handle, 
+                                    DOMID_SELF, dom, &port1, &port2) != 0 )
     {
         PyErr_SetString(port_error, "Could not open channel to domain");
         goto fail3;